Skip to content

Commit 21adf05

Browse files
committed
Change log level and avoid null check if exception caught.
1 parent c333c7d commit 21adf05

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

embulk-input-mysql/src/main/java/org/embulk/input/MySQLTimeZoneComparison.java

+29-31
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,39 @@ public void compareTimeZone()
3131
TimeZone serverTimeZone = null;
3232
try {
3333
serverTimeZone = getServerTimeZone();
34-
}
35-
catch (SQLException ex) {
36-
logger.error(String.format(Locale.ENGLISH, "SQLException raised %s", ex.toString()));
37-
}
38-
39-
if (serverTimeZone == null) {
40-
logger.warn("Can't get server TimeZone.");
41-
return;
42-
}
34+
if (serverTimeZone == null) {
35+
logger.warn("Can't get server TimeZone.");
36+
return;
37+
}
4338

44-
TimeZone clientTimeZone = TimeZone.getDefault();
45-
Date today = new Date();
46-
int clientOffset = clientTimeZone.getRawOffset();
39+
TimeZone clientTimeZone = TimeZone.getDefault();
40+
Date today = new Date();
41+
int clientOffset = clientTimeZone.getRawOffset();
4742

48-
if (clientTimeZone.inDaylightTime(today)) {
49-
clientOffset += clientTimeZone.getDSTSavings();
50-
}
43+
if (clientTimeZone.inDaylightTime(today)) {
44+
clientOffset += clientTimeZone.getDSTSavings();
45+
}
5146

52-
//
53-
// Compare offset only. Although I expect to return true, the following code return false,
54-
//
55-
// TimeZone tz_jst = TimeZone.getTimeZone("JST");
56-
// TimeZone tz_gmt9 = TimeZone.getTimeZone("GMT+9");
57-
// tz_jst.hasSameRules(tz_gmt9) // return false.
58-
//
59-
if (clientOffset != serverTimeZone.getRawOffset()) {
60-
logger.warn(String.format(Locale.ENGLISH,
61-
"The client timezone(%s) is different from the server timezone(%s). The plugin will fetch wrong datetime values.",
62-
clientTimeZone.getID(), serverTimeZone.getID()));
63-
logger.warn(String.format(Locale.ENGLISH,
64-
"Use You may need to set options `useLegacyDatetimeCode` and `serverTimeZone`"));
65-
logger.warn(String.format(Locale.ENGLISH,
66-
"Ex. `options: { useLegacyDatetimeCode: false, serverTimeZone: UTC }`"));
47+
//
48+
// Compare offset only. Although I expect to return true, the following code return false,
49+
//
50+
// TimeZone tz_jst = TimeZone.getTimeZone("JST");
51+
// TimeZone tz_gmt9 = TimeZone.getTimeZone("GMT+9");
52+
// tz_jst.hasSameRules(tz_gmt9) // return false.
53+
//
54+
if (clientOffset != serverTimeZone.getRawOffset()) {
55+
logger.warn(String.format(Locale.ENGLISH,
56+
"The client timezone(%s) is different from the server timezone(%s). The plugin will fetch wrong datetime values.",
57+
clientTimeZone.getID(), serverTimeZone.getID()));
58+
logger.warn(String.format(Locale.ENGLISH,
59+
"You may need to set options `useLegacyDatetimeCode` and `serverTimeZone`"));
60+
logger.warn(String.format(Locale.ENGLISH,
61+
"Example: `options: { useLegacyDatetimeCode: false, serverTimeZone: UTC }`"));
62+
}
63+
logger.warn(String.format(Locale.ENGLISH, "The plugin will set `useLegacyDatetimeCode=false` by default in future.")); }
64+
catch (SQLException ex) {
65+
logger.warn(String.format(Locale.ENGLISH, "SQLException raised %s", ex.toString()));
6766
}
68-
logger.warn(String.format(Locale.ENGLISH, "The plugin will set `useLegacyDatetimeCode=false` by default in future."));
6967
}
7068

7169
private TimeZone getServerTimeZone()

0 commit comments

Comments
 (0)