Set logging program name

source/lib/RippingCluster/LogEntry.class.php

@@ -16,8 +16,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
         static::$types['job_id'] = 'int'; 
     }
 
-    protected function __construct($level, $category, $ctime, $pid, $file, $line, $message, $job_id) {
+    protected function __construct($level, $category, $ctime, $hostname, $progname, $pid, $file, $line, $message, $job_id) {
-        parent::__construct($level, $category, $ctime, $pid, $file, $line, $message);
+        parent::__construct($level, $category, $ctime, $hostname, $progname, $pid, $file, $line, $message);
         
         $this->job_id = $job_id;
     }
@@ -27,6 +27,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
             $row['level'],
             $row['category'],
             $row['ctime'],
+            $row['hostname'],
+            $row['progname'],
             $row['pid'],
             $row['file'],
             $row['line'],
@@ -40,8 +42,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
             $this->level,
             $this->category,
             $this->ctime,
-            static::$hostname,
+            $this->hostname,
-            static::$progname,
+            $this->progname,
             $this->pid,
             $this->file,
             $this->line,
@@ -56,7 +58,7 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
     
     protected static function log($logger, $severity, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
         $backtrace = debug_backtrace(false);
-        $entry = new self($severity, $category, time(), getmypid(), $backtrace[1]['file'], $backtrace[1]['line'], $message, $job_id);
+        $entry = new self($severity, $category, time(), static::$localHostname, static::$localProgname, getmypid(), $backtrace[1]['file'], $backtrace[1]['line'], $message, $job_id);
         
         $logger->log($entry);
     }

source/lib/RippingCluster/Main.class.php

@@ -16,7 +16,8 @@ class RippingCluster_Main extends SihnonFramework_Main {
 
         $this->request  = new RippingCluster_RequestParser($request_string);
 
-        if (HBC_File == 'index') {
+        switch (HBC_File) {
+            case 'index': {
                 $this->smarty = new Smarty();
                 $this->smarty->template_dir = './source/templates';
                 $this->smarty->compile_dir  = './tmp/templates';
@@ -29,6 +30,8 @@ class RippingCluster_Main extends SihnonFramework_Main {
                 $this->smarty->assign('messages', array());
                  
                 $this->smarty->assign('base_uri', $this->base_uri);
+            } break;
+
         }
     }
 

webui/index.php

@@ -6,6 +6,7 @@ require '_inc.php';
 
 try {
     $main = RippingCluster_Main::instance();
+    RippingCluster_LogEntry::setLocalProgname('webui');        	
     $smarty = $main->smarty();
     
     $page = new RippingCluster_Page($smarty, $main->request());

worker/ripping-cluster-worker.php

@@ -2,7 +2,17 @@
 
 define('HBC_File', 'worker');
 
-require_once '/etc/ripping-cluster/config.php';
+$options = array();
+if (isset($_SERVER['argv'])) {
+    $options = getopt('c:', array('config:'));
+}
+
+if (isset($options['config'])) {
+    require_once $options['config'];
+} else {
+    require_once '/etc/ripping-cluster/config.php';
+}
+
 require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
 require_once 'Net/Gearman/Worker.php';
 
@@ -16,6 +26,7 @@ try {
     set_time_limit(0);
     
     $main = RippingCluster_Main::instance();
+    RippingCluster_LogEntry::setLocalProgname('ripping-cluster-worker');
     $smarty = $main->smarty();
 
     $worker = new RippingCluster_Worker();