Extend logging in JsonRpcReader

[signal-cli] / src / main / java / org / asamk / signal / commands / DaemonCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index a121c7e93de4f31bc9dfb60b7fe480baf8299169..ee9368f87fb521096ed0004c2bc8aaa0b83b9f8d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -6,11 +6,12 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;
 
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.DbusReceiveMessageHandler;

-import org.asamk.signal.JsonDbusReceiveMessageHandler;
+import org.asamk.signal.JsonReceiveMessageHandler;

 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;

+import org.asamk.signal.ReceiveMessageHandler;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;


@@ -68,6 +69,7 @@ public class DaemonCommand implements MultiLocalCommand {
             var t = run(conn, objectPath, m, outputWriter);
 
             conn.requestBusName(DbusConfig.getBusname());
             var t = run(conn, objectPath, m, outputWriter);
 
             conn.requestBusName(DbusConfig.getBusname());

+            logger.info("DBus daemon running in single-user mode for " + m.getSelfNumber());

 
             try {
                 t.join();
 
             try {
                 t.join();


@@ -113,6 +115,7 @@ public class DaemonCommand implements MultiLocalCommand {
             }
 
             conn.requestBusName(DbusConfig.getBusname());
             }
 
             conn.requestBusName(DbusConfig.getBusname());

+            logger.info("DBus daemon running in mulit-account mode");

 
             signalControl.run();
         } catch (DBusException | IOException e) {
 
             signalControl.run();
         } catch (DBusException | IOException e) {


@@ -129,13 +132,15 @@ public class DaemonCommand implements MultiLocalCommand {
         final var initThread = new Thread(signal::initObjects);
         initThread.start();
 
         final var initThread = new Thread(signal::initObjects);
         initThread.start();
 

-        logger.info("Exported dbus object: " + objectPath);
+        logger.debug("Exported dbus object: " + objectPath);
+
+        final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
+                (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
+        m.addReceiveHandler(handler);
+
+        final var dbusMessageHandler = new DbusReceiveMessageHandler(m, conn, objectPath);
+        m.addReceiveHandler(dbusMessageHandler);

 
 

-        final var receiveMessageHandler = outputWriter instanceof JsonWriter ? new JsonDbusReceiveMessageHandler(m,
-                (JsonWriter) outputWriter,
-                conn,
-                objectPath) : new DbusReceiveMessageHandler(m, (PlainTextWriter) outputWriter, conn, objectPath);
-        m.addReceiveHandler(receiveMessageHandler);

         return initThread;
     }
 }
         return initThread;
     }
 }