Updated logging to support multiple tables
This commit is contained in:
@@ -6,15 +6,17 @@ class HandBrakeCluster_Log {
|
|||||||
|
|
||||||
private $database;
|
private $database;
|
||||||
private $config;
|
private $config;
|
||||||
|
private $table;
|
||||||
|
|
||||||
public function __construct(HandBrakeCluster_Database $database, HandBrakeCluster_Config $config) {
|
public function __construct(HandBrakeCluster_Database $database, HandBrakeCluster_Config $config, $table) {
|
||||||
$this->database = $database;
|
$this->database = $database;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
|
$this->table = $table;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function log($severity, $message, $job_id = 0) {
|
public function log($severity, $message, $job_id = 0) {
|
||||||
$this->database->insert('INSERT INTO client_log (job_id,level,ctime,pid,hostname,progname,line,message) VALUES(:job_id, :level, :ctime, :pid, :hostname, :progname, :line, :message)',
|
$this->database->insert("INSERT INTO {$this->table} (job_id,level,ctime,pid,hostname,progname,line,message) VALUES(:job_id, :level, :ctime, :pid, :hostname, :progname, :line, :message)",
|
||||||
array(
|
array(
|
||||||
array('name' => 'job_id', 'value' => $job_id, 'type' => PDO::PARAM_INT),
|
array('name' => 'job_id', 'value' => $job_id, 'type' => PDO::PARAM_INT),
|
||||||
array('name' => 'level', 'value' => $severity, 'type' => PDO::PARAM_STR),
|
array('name' => 'level', 'value' => $severity, 'type' => PDO::PARAM_STR),
|
||||||
|
|||||||
@@ -18,11 +18,22 @@ class HandBrakeCluster_Main {
|
|||||||
private function __construct() {
|
private function __construct() {
|
||||||
$request_string = isset($_GET['l']) ? $_GET['l'] : '';
|
$request_string = isset($_GET['l']) ? $_GET['l'] : '';
|
||||||
|
|
||||||
|
$log_table = null;
|
||||||
|
switch(HBC_File) {
|
||||||
|
case 'index': {
|
||||||
|
$log_table = 'client_log';
|
||||||
|
} break;
|
||||||
|
|
||||||
|
case 'worker': {
|
||||||
|
$log_table = 'worker_log';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->config = new HandBrakeCluster_Config(HandBrakeCluster_DBConfig);
|
$this->config = new HandBrakeCluster_Config(HandBrakeCluster_DBConfig);
|
||||||
$this->database = new HandBrakeCluster_Database($this->config);
|
$this->database = new HandBrakeCluster_Database($this->config);
|
||||||
$this->config->setDatabase($this->database);
|
$this->config->setDatabase($this->database);
|
||||||
|
|
||||||
$this->log = new HandBrakeCluster_Log($this->database, $this->config);
|
$this->log = new HandBrakeCluster_Log($this->database, $this->config, $log_table);
|
||||||
$this->request = new HandBrakeCluster_RequestParser($request_string);
|
$this->request = new HandBrakeCluster_RequestParser($request_string);
|
||||||
$this->cache = new HandBrakeCluster_Cache($this->config);
|
$this->cache = new HandBrakeCluster_Cache($this->config);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user