more debugging for sendxmpp logger

cweiske · Dec 1, 2014 · eee192b · eee192b
1 parent 884e4dd
commit eee192b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/scripts/test-xmpp.php b/scripts/test-xmpp.php
@@ -3,6 +3,7 @@
 require_once __DIR__ . '/../tests/bootstrap.php';
 
 $l = new Logger_CallSendXmpp('cweiske@cweiske.de', 'i', array('12345'));
+$l->debug = true;
 
 $call = new CallMonitor_Call();
 $call->type  = 'i';

diff --git a/src/callnotifier/Logger/CallSendXmpp.php b/src/callnotifier/Logger/CallSendXmpp.php
@@ -8,7 +8,7 @@
 class Logger_CallSendXmpp extends Logger_CallBase
 {
     protected $recipients;
-    protected $debug = false;
+    public $debug = false;
 
     public function __construct($recipients, $callTypes = 'i', $msns = array())
     {
@@ -61,19 +61,26 @@ protected function notify($msg)
         $runInBackground = ' > /dev/null 2>&1 &';
         if ($this->debug) {
             $runInBackground = '';
-            echo $msg . "\n";
+            echo "Message:\n" . $msg . "\n";
+            echo 'Sending to ' . count((array) $this->recipients)
+                . " recipients\n";
         }
 
         foreach ((array)$this->recipients as $recipient) {
             //use system instead of exec to make debugging possible
-            system(
-                'echo ' . escapeshellarg($msg)
+            $cmd = 'echo ' . escapeshellarg($msg)
                 . ' | sendxmpp'
                 . ' --message-type=headline'//no offline storage
                 . ' --resource callnotifier'
                 . ' ' . escapeshellarg($recipient)
-                . $runInBackground
-            );
+                . $runInBackground;
+            if ($this->debug) {
+                echo "Executing:\n" . $cmd . "\n";
+            }
+            system($cmd, $retval);
+            if ($this->debug) {
+                echo 'Exit code: ' . $retval . "\n";
+            }
         }
     }
 }