diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php index bec7ec852..2e52733bd 100644 --- a/modules/monitoring/application/controllers/ProcessController.php +++ b/modules/monitoring/application/controllers/ProcessController.php @@ -52,6 +52,7 @@ class Monitoring_ProcessController extends Controller 'endpoint_name', 'program_start_time', 'status_update_time', + 'program_version', 'last_command_check', 'last_log_rotation', 'global_service_event_handler', diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index de322ac83..5ebecce4d 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -19,6 +19,12 @@ if (! $this->compact): ?>

translate('Process Info') ?>

+ + + + @@ -50,7 +56,7 @@ if (! $this->compact): ?> : $this->translate('N/A'); ?> - + @@ -60,14 +66,14 @@ if (! $this->compact): ?> programStatus->is_currently_running === true): ?>
translate('%s has been up and running with PID %d since %s'), + $this->translate('Backend %s has been up and running with PID %d since %s'), $this->backendName, $this->programStatus->process_id, $this->timeSince($this->programStatus->program_start_time)) ?>
- translate('%s is not running'), $this->backendName) ?> + translate('Backend %s is not running'), $this->backendName) ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php index 57f8ed1ac..d1e0b71b4 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php @@ -12,6 +12,7 @@ class ProgramstatusQuery extends IdoQuery 'programstatus' => array( 'id' => 'programstatus_id', 'status_update_time' => 'UNIX_TIMESTAMP(programstatus.status_update_time)', + 'program_version' => 'program_version', 'program_start_time' => 'UNIX_TIMESTAMP(programstatus.program_start_time)', 'program_end_time' => 'UNIX_TIMESTAMP(programstatus.program_end_time)', 'is_currently_running' => 'CASE WHEN (programstatus.is_currently_running = 0) @@ -56,5 +57,8 @@ class ProgramstatusQuery extends IdoQuery if (version_compare($this->getIdoVersion(), '1.11.7', '<')) { $this->columnMap['programstatus']['endpoint_name'] = '(0)'; } + if (version_compare($this->getIdoVersion(), '1.11.8', '<')) { + $this->columnMap['programstatus']['program_version'] = '(NULL)'; + } } }
translate('Program Version') ?>programStatus->program_version + ? $this->programStatus->program_version + : $this->translate('N/A') ?>
translate('Program Start Time') ?> dateFormat()->formatDateTime($this->programStatus->program_start_time) ?>
translate('Active IDO Endpoint'); ?>translate('Active Endpoint'); ?> programStatus->endpoint_name ? $this->programStatus->endpoint_name : $this->translate('N/A') ?>