Commit 931f2030 authored by Arpad Lovassy's avatar Arpad Lovassy Committed by Gerrit Code Review
Browse files

Merge changes I3b6a258b,Ia9ca936d

* changes:
  the padding shall be zeros.
  lets change padding from left to right.
parents 92ff37b3 0e5951b8
...@@ -106,7 +106,7 @@ public abstract class BaseExecutor { ...@@ -106,7 +106,7 @@ public abstract class BaseExecutor {
protected static final boolean CREATE_TEMP_CFG = false; protected static final boolean CREATE_TEMP_CFG = false;
public static final String PADDEDDATETIMEFORMAT = "%1$tF %1$tH:%1$tM:%1$tS.%1$tL000"; public static final String PADDEDDATETIMEFORMAT = "%1$tF %1$tH:%1$tM:%1$tS.%1$tL000";
public static final String DATETIMEFORMAT = "%1$tF %1$tH:%1$tM:%1$tS.%2$06d"; public static final String DATETIMEFORMAT = "%1$tF %1$tH:%1$tM:%1$tS.%2$-6d";
public static final String MAIN_CONTROLLER = "Main Controller"; public static final String MAIN_CONTROLLER = "Main Controller";
protected static final String CONFIGFILEPATH_NULL = "Could not launch beacuse the configuration file's path is null"; protected static final String CONFIGFILEPATH_NULL = "Could not launch beacuse the configuration file's path is null";
......
...@@ -371,7 +371,7 @@ public class NativeJavaExecutor extends BaseExecutor { ...@@ -371,7 +371,7 @@ public class NativeJavaExecutor extends BaseExecutor {
severity = Integer.parseInt(value[3]); severity = Integer.parseInt(value[3]);
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1])); formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1]));
times.add(formatter.toString()); times.add(formatter.toString().replace(' ', '0'));
tempNotifications.add(new Notification(formatter.toString(), SeverityResolver.getSeverityString(severity), value[2], value[4])); tempNotifications.add(new Notification(formatter.toString(), SeverityResolver.getSeverityString(severity), value[2], value[4]));
formatter.close(); formatter.close();
} }
...@@ -379,7 +379,7 @@ public class NativeJavaExecutor extends BaseExecutor { ...@@ -379,7 +379,7 @@ public class NativeJavaExecutor extends BaseExecutor {
for (final String[] value : s) { for (final String[] value : s) {
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1])); formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1]));
times.add(formatter.toString()); times.add(formatter.toString().replace(' ', '0'));
tempNotifications.add(new Notification(formatter.toString(), EMPTY_STRING, value[2], value[4])); tempNotifications.add(new Notification(formatter.toString(), EMPTY_STRING, value[2], value[4]));
formatter.close(); formatter.close();
} }
...@@ -421,7 +421,7 @@ public class NativeJavaExecutor extends BaseExecutor { ...@@ -421,7 +421,7 @@ public class NativeJavaExecutor extends BaseExecutor {
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(time.tv_sec * 1000), time.tv_usec); formatter.format(DATETIMEFORMAT, new Date(time.tv_sec * 1000), time.tv_usec);
final String timestamp = formatter.toString(); final String timestamp = formatter.toString().replace(' ', '0');
formatter.close(); formatter.close();
if (severityLevelExtraction) { if (severityLevelExtraction) {
......
...@@ -348,7 +348,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback { ...@@ -348,7 +348,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback {
severity = Integer.parseInt(value[3]); severity = Integer.parseInt(value[3]);
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1])); formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1]));
times.add(formatter.toString()); times.add(formatter.toString().replace(' ', '0'));
tempNotifications.add(new Notification(formatter.toString(), SeverityResolver.getSeverityString(severity), value[2], value[4])); tempNotifications.add(new Notification(formatter.toString(), SeverityResolver.getSeverityString(severity), value[2], value[4]));
formatter.close(); formatter.close();
} }
...@@ -356,7 +356,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback { ...@@ -356,7 +356,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback {
for (final String[] value : s) { for (final String[] value : s) {
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1])); formatter.format(DATETIMEFORMAT, new Date(Long.parseLong(value[0]) * 1000), Long.valueOf(value[1]));
times.add(formatter.toString()); times.add(formatter.toString().replace(' ', '0'));
tempNotifications.add(new Notification(formatter.toString(), EMPTY_STRING, value[2], value[4])); tempNotifications.add(new Notification(formatter.toString(), EMPTY_STRING, value[2], value[4]));
formatter.close(); formatter.close();
} }
...@@ -394,7 +394,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback { ...@@ -394,7 +394,7 @@ public final class JniExecutor extends BaseExecutor implements IJNICallback {
final Formatter formatter = new Formatter(); final Formatter formatter = new Formatter();
formatter.format(DATETIMEFORMAT, new Date(time.tv_sec * 1000), time.tv_usec); formatter.format(DATETIMEFORMAT, new Date(time.tv_sec * 1000), time.tv_usec);
final String timestamp = formatter.toString(); final String timestamp = formatter.toString().replace(' ', '0');
formatter.close(); formatter.close();
if (severityLevelExtraction) { if (severityLevelExtraction) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment