Browse Source

Fix timezone problem of sentinel-block.log

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
master
Eric Zhao 4 years ago
parent
commit
87f95adc2e
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      sentinel-core/src/main/java/com/alibaba/csp/sentinel/eagleeye/FastDateFormat.java
  2. +4
    -2
      sentinel-core/src/test/java/com/alibaba/csp/sentinel/eagleeye/EagleEyeCoreUtilsTest.java

+ 1
- 1
sentinel-core/src/main/java/com/alibaba/csp/sentinel/eagleeye/FastDateFormat.java View File

@@ -75,7 +75,7 @@ class FastDateFormat {


private SimpleDateFormat createSimpleDateFormat() { private SimpleDateFormat createSimpleDateFormat() {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
fmt.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
fmt.setTimeZone(TimeZone.getDefault());
return fmt; return fmt;
} }
} }

+ 4
- 2
sentinel-core/src/test/java/com/alibaba/csp/sentinel/eagleeye/EagleEyeCoreUtilsTest.java View File

@@ -15,6 +15,8 @@
*/ */
package com.alibaba.csp.sentinel.eagleeye; package com.alibaba.csp.sentinel.eagleeye;


import java.util.TimeZone;

import org.junit.Assert; import org.junit.Assert;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -153,8 +155,8 @@ public class EagleEyeCoreUtilsTest {


@Test @Test
public void testFormatTime() { public void testFormatTime() {
Assert.assertEquals("2019-06-15 20:13:14.000",
EagleEyeCoreUtils.formatTime(1560600794000L));
Assert.assertEquals("2019-06-15 12:13:14.000",
EagleEyeCoreUtils.formatTime(1560600794000L - TimeZone.getDefault().getRawOffset()));
} }


@Test @Test


Loading…
Cancel
Save