ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate changes to logging system from framework library

Browse Source
This commit is contained in:
Ben Roberts
2011-08-06 14:54:22 +01:00
parent 5121f78cea
commit 9697654594
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/RippingCluster/LogEntry.class.php
View File

@@ -16,8 +16,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
static::$types['job_id'] = 'int'; 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; $this->job_id = $job_id;
} }
@@ -27,6 +27,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
$row['level'], $row['level'],
$row['category'], $row['category'],
$row['ctime'], $row['ctime'],
$row['hostname'],
$row['progname'],
$row['pid'], $row['pid'],
$row['file'], $row['file'],
$row['line'], $row['line'],
@@ -40,8 +42,8 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
$this->level, $this->level,
$this->category, $this->category,
$this->ctime, $this->ctime,
static::$hostname, $this->hostname,
static::$progname, $this->progname,
$this->pid, $this->pid,
$this->file, $this->file,
$this->line, $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) { protected static function log($logger, $severity, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
$backtrace = debug_backtrace(false); $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); $logger->log($entry);
} }