0001224: symmetric service wrapper - rename to "server" instead of "s…

…ym", formatting for log
JumpMind · May 23, 2014 · 519d9c0 · 519d9c0
1 parent 70cec6c
commit 519d9c0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/symmetric-server/src/main/deploy/conf/sym_service.conf b/symmetric-server/src/main/deploy/conf/sym_service.conf
@@ -50,7 +50,7 @@ wrapper.logfile=../logs/wrapper.log
 wrapper.pidfile=../tmp/wrapper.pid
 
 # SymmetricDS process ID
-wrapper.sym.pidfile=../tmp/symmetric.pid
+wrapper.server.pidfile=../tmp/server.pid
 
 # Log level (SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST)
 wrapper.logfile.loglevel=INFO

diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
@@ -58,8 +58,8 @@ public String getWrapperPidFile() {
         return getProperty(prop, "wrapper.pidfile", "../tmp/wrapper.pid");
     }
 
-    public String getSymPidFile() {
-        return getProperty(prop, "wrapper.sym.pidfile", "../tmp/symmetric.pid");
+    public String getServerPidFile() {
+        return getProperty(prop, "wrapper.server.pidfile", "../tmp/server.pid");
     }
 
     public long getLogFileMaxSize() {

diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperLogFormatter.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperLogFormatter.java
@@ -7,16 +7,20 @@
 
 public class WrapperLogFormatter extends Formatter {
 
-    protected static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,S");
+    protected static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     protected static final String NEWLINE = System.getProperty("line.separator");
 
     @Override
     public String format(LogRecord record) {
-        String[] classname = record.getSourceClassName().split("\\.");
-        return DATE_FORMATTER.format(new Date(record.getMillis())) + " "
-                + record.getLevel().getName() + " [" + classname[classname.length - 1] + "] ["
-                + record.getThreadID() + "] " + record.getMessage() + NEWLINE;
+        Object[] parms = record.getParameters();
+        String source = "wrapper";
+        if (parms != null && parms.length > 0) {
+            source = parms[0].toString();
+        }
+        return DATE_FORMATTER.format(new Date(record.getMillis())) + " ["
+                + String.format("%-7s", record.getLevel().getName()) + "] [" + String.format("%-7s", source) + "] "
+                + record.getMessage() + NEWLINE;
     }
 
 }
diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperService.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperService.java
@@ -96,7 +96,7 @@ protected void execJava(boolean isConsole) {
 
         int pid = getCurrentPid();
         writePidToFile(pid, config.getWrapperPidFile());
-        logger.log(Level.INFO, "Started wrapper [" + pid + "]");
+        logger.log(Level.INFO, "Started wrapper as PID " + pid);
 
         ArrayList<String> cmd = config.getCommand(isConsole);
         String cmdString = commandToString(cmd);
@@ -126,8 +126,8 @@ protected void execJava(boolean isConsole) {
                 }
 
                 serverPid = getProcessPid(child);
-                logger.log(Level.INFO, "Started server [" + serverPid + "]");
-                writePidToFile(serverPid, config.getSymPidFile());
+                logger.log(Level.INFO, "Started server as PID " + serverPid);
+                writePidToFile(serverPid, config.getServerPidFile());
 
                 if (startCount == 0) {
                     Runtime.getRuntime().addShutdownHook(new ShutdownHook());
@@ -144,7 +144,7 @@ protected void execJava(boolean isConsole) {
                         if (isConsole) {
                             System.out.println(line);
                         } else {
-                            logger.log(Level.INFO, line);
+                            logger.log(Level.INFO, line, "java");
                         }
                         if (line.matches(".*java.lang.OutOfMemoryError.*") || line.matches(".*java.net.BindException.*")) {
                             logger.log(Level.SEVERE, "Stopping server because its output matches a failure condition");
@@ -174,7 +174,7 @@ protected void execJava(boolean isConsole) {
     }
 
     public void stop() {
-        int symPid = readPidFromFile(config.getSymPidFile());
+        int symPid = readPidFromFile(config.getServerPidFile());
         int wrapperPid = readPidFromFile(config.getWrapperPidFile());
         if (!isPidRunning(symPid) && !isPidRunning(wrapperPid)) {
             throw new WrapperException(Constants.RC_SERVER_NOT_RUNNING, 0, "Server is not running");
@@ -209,7 +209,7 @@ protected void shutdown() {
             }
             logger.log(Level.INFO, "Stopping wrapper");
             deletePidFile(config.getWrapperPidFile());
-            deletePidFile(config.getSymPidFile());
+            deletePidFile(config.getServerPidFile());
             updateStatus(Status.STOPPED);
         }
     }
@@ -227,15 +227,16 @@ public void status() {
     }
 
     public boolean isRunning() {
-        return isPidRunning(readPidFromFile(config.getSymPidFile()));
+        return isPidRunning(readPidFromFile(config.getWrapperPidFile())) ||
+                isPidRunning(readPidFromFile(config.getServerPidFile()));
     }
 
     public int getWrapperPid() {
         return readPidFromFile(config.getWrapperPidFile());
     }
 
-    public int getSymmetricPid() {
-        return readPidFromFile(config.getSymPidFile());
+    public int getServerPid() {
+        return readPidFromFile(config.getServerPidFile());
     }
 
     protected String commandToString(ArrayList<String> cmd) {