prevent E_NOTICE

[auerswald-callnotifier.git] / src / callnotifier / CLI.php

diff --git a/src/callnotifier/CLI.php b/src/callnotifier/CLI.php
index 2a6d3ca6ea4aa5d96c233ff5d2ff28ae235ef8a8..0b8ae60773c1cac7a48ca2dfa51776aa4b9bb7b2 100644 (file)
--- a/src/callnotifier/CLI.php
+++ b/src/callnotifier/CLI.php
@@ -5,7 +5,6 @@ namespace callnotifier;
 class CLI
 {
     protected $cliParser;
-    protected $config;
 
     public function __construct()
     {
@@ -14,14 +13,14 @@ class CLI
 
     public function run()
     {
-        $this->config = new Config();
+        $config = new Config();
         try {
             $result = $this->cliParser->parse();
         } catch (\Exception $exc) {
             $this->cliParser->displayError($exc->getMessage());
         }
 
-        $this->fillConfig($this->config, $result);
+        $this->fillConfig($config, $result);
 
         $log = new Log();
         if ($result->options['debug'] || $result->options['debugEdss1']) {
@@ -31,21 +30,32 @@ class CLI
                 $debugLogger->edss1MsgOnly = true;
             }
         }
-        $log->addLogger(
-            new Logger_CallEcho(), array('startingCall', 'finishedCall')
-        );
 
-        $callMonitor = new CallMonitor($this->config, $log);
+        $callMonitor = new CallMonitor($config, $log);
+
+        $configFile = $this->getConfigFile();
+        if ($configFile !== null) {
+            include $configFile;
+        }
 
-        $handler = new MessageHandler($this->config, $log, $callMonitor);
+        $handler = new MessageHandler($config, $log, $callMonitor);
 
-        if ($this->config->replayFile !== null) {
+        if ($config->replayFile !== null) {
             $sourceClass = 'callnotifier\Source_File';
         } else {
             $sourceClass = 'callnotifier\Source_Remote';
         }
-        $source = new $sourceClass($this->config, $handler);
-        $source->run();
+
+        try {
+            $source = new $sourceClass($config, $handler);
+            $source->run();
+        } catch (\Exception $e) {
+            $msg = 'Callnotifier error!' . "\n"
+                . 'Code: ' . $e->getCode() . "\n"
+                . 'Message: ' . $e->getMessage() . "\n";
+            file_put_contents('php://stderr', $msg);
+            exit(1);
+        }
     }
 
     public function setupCli()
@@ -69,7 +79,7 @@ class CLI
             'dumpFile',
             array(
                 'long_name'   => '--dump',
-                'description' => 'dump messages into file for later replay',
+                'description' => 'Dump messages into file for later replay',
                 'help_name'   => 'FILE',
                 'action'      => 'StoreString'
             )
@@ -112,6 +122,39 @@ class CLI
         $config->setIfNotEmpty('dumpFile', $result->options['dumpFile']);
         $config->setIfNotEmpty('replayFile', $result->options['replayFile']);
     }
+
+    /**
+     * Finds the path to the configuration file.
+     *
+     * The following locations are tried:
+     * - Git checkout: data/callnotifier.config.php
+     * - ~/.config/callnotifier.config.php
+     * - /etc/callnotifier.config.php
+     *
+     * @return string Full path of config file or NULL if no file found
+     */
+    protected function getConfigFile()
+    {
+        if (basename(dirname(__DIR__)) == 'src'
+            && file_exists(__DIR__ . '/../../data/callnotifier.config.php')
+        ) {
+            return __DIR__ . '/../../data/callnotifier.config.php';
+        }
+
+        if (isset($_ENV['HOME'])) {
+            $file = $_ENV['HOME'] . '/.config/callnotifier.config.php';
+            if (file_exists($file)) {
+                return $file;
+            }
+        }
+
+        $file = '/etc/callnotifier.config.php';
+        if (file_exists($file)) {
+            return $file;
+        }
+
+        return null;
+    }
 }
 
 ?>
\ No newline at end of file