See changes inside.

major change in multibus error handling. I reintroduced bugs ..

1 files changed, 8 insertions, 4 deletions

diff --git a/src/IvyDaemon.java b/src/IvyDaemon.java
index 363337b..910a52d 100644
--- a/src/IvyDaemon.java
+++ b/src/IvyDaemon.java
@@ -11,6 +11,8 @@
  * (c) CENA
  *
  * changelog:
+ *   1.2.8
+ *    - goes into tools subpackage
  *   1.2.3
  *    - adds the traceDebug
  *    - uses the clientThread paradigm to programm the thread sync
@@ -22,7 +24,8 @@
  *   1.0.12
  *    - class goes public access !
  */
-package fr.dgac.ivy ;
+package fr.dgac.ivy.tools ;
+import fr.dgac.ivy.* ;
 import java.io.*;
 import java.net.*;
 import java.util.Properties ;
@@ -40,12 +43,13 @@ public class IvyDaemon implements Runnable {
   public static int DEFAULT_SERVICE_PORT = 3456 ;
   public static final String DEFAULTNAME = "IvyDaemon";
   public static final String helpmsg = "usage: java fr.dgac.ivy.IvyDaemon [options]\n\t-b BUS\tspecifies the Ivy bus domain\n\t-p\tport number, default "+DEFAULT_SERVICE_PORT+"\n\t-n ivyname (default "+DEFAULTNAME+")\n\t-q\tquiet, no tty output\n\t-d\tdebug\n\t-h\thelp\nListens on the TCP port, and sends each line read on the Ivy bus. It is useful to launch one Ivy Daemon and let scripts send their message on the bus.\n";
+
+  private static String name = DEFAULTNAME;
   public static void main(String[] args) throws IvyException, IOException {
     Ivy bus;
     Getopt opt = new Getopt("IvyDaemon",args,"n:b:dqp:h");
     int c;
     int servicePort = DEFAULT_SERVICE_PORT;
-    String name = DEFAULTNAME;
     boolean quiet = false;
     String domain=Ivy.getDomain(null);
     while ((c = opt.getopt()) != -1) switch (c) {
@@ -135,8 +139,8 @@ public class IvyDaemon implements Runnable {
     }
   }
 
-  private void traceDebug(String s){
-    if (debug) System.out.println("-->IvyDaemon "+bus.appName+"<-- "+s);
+  private static void traceDebug(String s){
+    if (debug) System.out.println("-->IvyDaemon "+name+"<-- "+s);
   }
 
 }