- Implemented: New cron class and split up cron_daily

- Implemented: FS#3110 - Turn monitoring module into cron jobs

install/sql/ispconfig3.sql

@@ -1429,6 +1429,22 @@ CREATE TABLE `sys_config` (
   `value` varchar(255) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `sys_cron`
+--
+
+CREATE TABLE IF NOT EXISTS `sys_cron` (
+  `name` varchar(50) NOT NULL,
+  `last_run` datetime NULL DEFAULT NULL,
+  `next_run` datetime NULL DEFAULT NULL,
+  `running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- --------------------------------------------------------
 
 --

server/cron.php

+<?php
+
+/*
+Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
+require(SCRIPT_PATH."/lib/config.inc.php");
+require(SCRIPT_PATH."/lib/app.inc.php");
+
+set_time_limit(0);
+ini_set('error_reporting', E_ALL & ~E_NOTICE);
+
+// make sure server_id is always an int
+$conf['server_id'] = intval($conf['server_id']);
+
+
+// Load required base-classes
+$app->uses('ini_parser,file,services,getconf,system,cron,functions');
+$app->load('libdatetime,cronjob');
+
+
+// read all cron jobs
+$path = SCRIPT_PATH . '/lib/classes/cron.d';
+if(!is_dir($path)) die('Cron path missing!');
+$files = array();
+$d = opendir($path);
+while($f = readdir($d)) {
+    $file_path = $path . '/' . $f;
+    if($f === '.' || $f === '..' || !is_file($file_path)) continue;
+    if(substr($f, strrpos($f, '.')) !== '.php') continue;
+    $files[] = $f;
+}
+closedir($d);
+
+// sort in alphabetical order, so we can use prefixes like 000-xxx
+sort($files);
+    
+foreach($files as $f) {
+    $name = substr($f, 0, strpos($f, '.'));
+    if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numerical prefix from file name
+    
+    include($path . '/' . $f);
+    $class_name = 'cronjob_' . $name;
+    
+    if(class_exists($class_name, false)) {
+        $cronjob = new $class_name();
+        if(get_parent_class($cronjob) !== 'cronjob') {
+            print 'Invalid class ' . $class_name . ' not extending class cronjob (' . get_parent_class($cronjob) . ')!' . "\n";
+            unset($cronjob);
+            continue;
+        }
+        print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n";
+        
+        $cronjob->run();
+        
+        print 'run job (' . $class_name . ') done.' . "\n";
+        
+        unset($cronjob);
+    }
+}
+unset($files);
+
+die("finished.\n");
+
+?>

server/cron.sh

+#!/bin/sh
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+
+if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
+        PHPINIOWNER=`stat -c %U /usr/local/ispconfig/server/lib/php.ini`
+        if [ $PHPINIOWNER == 'root' ] || [ $PHPINIOWNER == 'ispconfig'  ]; then
+                export PHPRC=/usr/local/ispconfig/server/lib
+        fi
+fi
+
+/usr/bin/php -q /usr/local/ispconfig/server/cron.php

server/cron_daily.sh

 #!/bin/sh
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-
-if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
-        PHPINIOWNER=`stat -c %U /usr/local/ispconfig/server/lib/php.ini`
-        if [ $PHPINIOWNER == 'root' ] || [ $PHPINIOWNER == 'ispconfig'  ]; then
-                export PHPRC=/usr/local/ispconfig/server/lib
-        fi
-fi
-
-/usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php
-
-if [ -f /usr/local/ispconfig/server/cron_daily_billing.sh ]; then
-        /usr/local/ispconfig/server/cron_daily_billing.sh
-fi
+echo "This script is no longer used. Use the cron.sh instead."

server/lib/classes/cron.d/100-mailbox_stats.inc.php

+<?php
+
+/*
+Copyright (c) 2013, Marius Cramer, pixcept KG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class cronjob_mailbox_stats extends cronjob {
+    
+    // job schedule
+    protected $_schedule = '0 0 * * *';
+    
+    /* this function is optional if it contains no custom code */
+    public function onPrepare() {
+        global $app;
+        
+        parent::onPrepare();
+    }
+    
+    /* this function is optional if it contains no custom code */
+    public function onBeforeRun() {
+        global $app;
+        
+        return parent::onBeforeRun();
+    }
+    
+    public function onRunJob() {
+        global $app, $conf;
+        
+        // cronjob code here
+        
+        #######################################################################################################
+        // store the mailbox statistics in the database
+        #######################################################################################################
+
+        $parse_mail_log = false;
+        $sql = "SELECT mailuser_id,maildir FROM mail_user WHERE server_id = ".$conf['server_id'];
+        $records = $app->db->queryAllRecords($sql);
+        if(count($records) > 0) $parse_mail_log = true;
+
+        foreach($records as $rec) {
+            if(@is_file($rec['maildir'].'/ispconfig_mailsize')) {
+                $parse_mail_log = false;
+
+                // rename file
+                rename($rec['maildir'].'/ispconfig_mailsize',$rec['maildir'].'/ispconfig_mailsize_save');
+
+                // Read the file
+                $lines = file($rec['maildir'].'/ispconfig_mailsize_save');
+                $mail_traffic = 0;
+                foreach($lines as $line) {
+                    $mail_traffic += intval($line);
+                }
+                unset($lines);
+
+                // Delete backup file
+                if(@is_file($rec['maildir'].'/ispconfig_mailsize_save')) unlink($rec['maildir'].'/ispconfig_mailsize_save');
+
+                // Save the traffic stats in the sql database
+                $tstamp = date('Y-m');
+
+                $sql = "SELECT * FROM mail_traffic WHERE month = '$tstamp' AND mailuser_id = ".$rec['mailuser_id'];
+                $tr = $app->dbmaster->queryOneRecord($sql);
+
+                $mail_traffic += $tr['traffic'];
+                if($tr['traffic_id'] > 0) {
+                    $sql = "UPDATE mail_traffic SET traffic = $mail_traffic WHERE traffic_id = ".$tr['traffic_id'];
+                } else {
+                    $sql = "INSERT INTO mail_traffic (month,mailuser_id,traffic) VALUES ('$tstamp',".$rec['mailuser_id'].",$mail_traffic)";
+                }
+                $app->dbmaster->query($sql);
+                //echo $sql;
+
+            }
+
+        }
+
+        if($parse_mail_log == true) {
+            $mailbox_traffic = array();
+            $mail_boxes = array();
+            $mail_rewrites = array(); // we need to read all mail aliases and forwards because the address in amavis is not always the mailbox address
+
+            function parse_mail_log_line($line) {
+                //Oct 31 17:35:48 mx01 amavis[32014]: (32014-05) Passed CLEAN, [IPv6:xxxxx] [IPv6:xxxxx] <xxx@yyyy> -> <aaaa@bbbb>, Message-ID: <xxxx@yyyyy>, mail_id: xxxxxx, Hits: -1.89, size: 1591, queued_as: xxxxxxx, 946 ms
+
+                if(preg_match('/^(\w+\s+\d+\s+\d+:\d+:\d+)\s+[^ ]+\s+amavis.* <([^>]+)>\s+->\s+((<[^>]+>,)+) .*Message-ID:\s+<([^>]+)>.* size:\s+(\d+),.*$/', $line, $matches) == false) return false;
+
+                $timestamp = strtotime($matches[1]);
+                if(!$timestamp) return false;
+
+                $to = array();
+                $recipients = explode(',', $matches[3]);
+                foreach($recipients as $recipient) {
+                    $recipient = substr($recipient, 1, -1);
+                    if(!$recipient || $recipient == $matches[2]) continue;
+                    $to[] = $recipient;
+                }
+
+                return array('line' => $line, 'timestamp' => $timestamp, 'size' => $matches[6], 'from' => $matches[2], 'to' => $to, 'message-id' => $matches[5]);
+            }
+
+            function add_mailbox_traffic(&$traffic_array, $address, $traffic) {
+                global $mail_boxes, $mail_rewrites;
+
+                $address = strtolower($address);
+
+                if(in_array($address, $mail_boxes) == true) {
+                    if(!isset($traffic_array[$address])) $traffic_array[$address] = 0;
+                    $traffic_array[$address] += $traffic;
+                } elseif(array_key_exists($address, $mail_rewrites)) {
+                    foreach($mail_rewrites[$address] as $address) {
+                        if(!isset($traffic_array[$address])) $traffic_array[$address] = 0;
+                        $traffic_array[$address] += $traffic;
+                    }
+                } else {
+                    // this is not a local address - skip it
+                }
+            }
+
+            $sql = "SELECT email FROM mail_user WHERE server_id = ".$conf['server_id'];
+            $records = $app->db->queryAllRecords($sql);
+            foreach($records as $record) {
+                $mail_boxes[] = $record['email'];
+            }
+            $sql = "SELECT source, destination FROM mail_forwarding WHERE server_id = ".$conf['server_id'];
+            $records = $app->db->queryAllRecords($sql);
+            foreach($records as $record) {
+                $targets = preg_split('/[\n,]+/', $record['destination']);
+                foreach($targets as $target) {
+                    if(in_array($target, $mail_boxes)) {
+                        if(isset($mail_rewrites[$record['source']])) $mail_rewrites[$record['source']][] = $target;
+                        else $mail_rewrites[$record['source']] = array($target);
+                    }
+                }
+            }
+
+            $state_file = dirname(__FILE__) . '/mail_log_parser.state';
+            $prev_line = false;
+            $last_line = false;
+            $cur_line = false;
+
+            if(file_exists($state_file)) {
+                $prev_line = parse_mail_log_line(trim(file_get_contents($state_file)));
+                //if($prev_line) echo "continuing from previous run, log position: " . $prev_line['message-id'] . " at " . strftime('%d.%m.%Y %H:%M:%S', $prev_line['timestamp']) . "\n";
+            }
+
+            if(file_exists('/var/log/mail.log')) {
+                $fp = fopen('/var/log/mail.log', 'r');
+                //echo "Parsing mail.log...\n";
+                $l = 0;
+                while($line = fgets($fp, 8192)) {
+                    $l++;
+                    //if($l % 1000 == 0) echo "\rline $l";
+                    $cur_line = parse_mail_log_line($line);
+                    if(!$cur_line) continue;
+
+                    if($prev_line) {
+                        // check if this line has to be processed
+                        if($cur_line['timestamp'] < $prev_line['timestamp']) {
+                            $parse_mail_log = false; // we do not need to parse the second file!
+                            continue; // already processed
+                        } elseif($cur_line['timestamp'] == $prev_line['timestamp'] && $cur_line['message-id'] == $prev_line['message-id']) {
+                            $parse_mail_log = false; // we do not need to parse the second file!
+                            $prev_line = false; // this line has already been processed but the next one has to be!
+                            continue;
+                        }
+                    }
+
+                    add_mailbox_traffic($mailbox_traffic, $cur_line['from'], $cur_line['size']);
+                    foreach($cur_line['to'] as $to) {
+                        add_mailbox_traffic($mailbox_traffic, $to, $cur_line['size']);
+                    }
+                    $last_line = $line; // store for the state file
+                }
+                fclose($fp);
+                //echo "\n";
+            }
+
+            if($parse_mail_log == true && file_exists('/var/log/mail.log.1')) {
+                $fp = fopen('/var/log/mail.log.1', 'r');
+                //echo "Parsing mail.log.1...\n";
+                $l = 0;
+                while($line = fgets($fp, 8192)) {
+                    $l++;
+                    //if($l % 1000 == 0) echo "\rline $l";
+                    $cur_line = parse_mail_log_line($line);
+                    if(!$cur_line) continue;
+
+                    if($prev_line) {
+                        // check if this line has to be processed
+                        if($cur_line['timestamp'] < $prev_line['timestamp']) continue; // already processed
+                        if($cur_line['timestamp'] == $prev_line['timestamp'] && $cur_line['message-id'] == $prev_line['message-id']) {
+                            $prev_line = false; // this line has already been processed but the next one has to be!
+                            continue;
+                        }
+                    }
+
+                    add_mailbox_traffic($mailbox_traffic, $cur_line['from'], $cur_line['size']);
+                    foreach($cur_line['to'] as $to) {
+                        add_mailbox_traffic($mailbox_traffic, $to, $cur_line['size']);
+                    }
+                }
+                fclose($fp);
+                //echo "\n";
+            }
+            unset($mail_rewrites);
+            unset($mail_boxes);
+
+            // Save the traffic stats in the sql database
+            $tstamp = date('Y-m');
+            $sql = "SELECT mailuser_id,email FROM mail_user WHERE server_id = ".$conf['server_id'];
+            $records = $app->db->queryAllRecords($sql);
+            foreach($records as $rec) {
+                if(array_key_exists($rec['email'], $mailbox_traffic)) {
+                    $sql = "SELECT * FROM mail_traffic WHERE month = '$tstamp' AND mailuser_id = ".$rec['mailuser_id'];
+                    $tr = $app->dbmaster->queryOneRecord($sql);
+
+                    $mail_traffic = $tr['traffic'] + $mailbox_traffic[$rec['email']];
+                    if($tr['traffic_id'] > 0) {
+                        $sql = "UPDATE mail_traffic SET traffic = $mail_traffic WHERE traffic_id = ".$tr['traffic_id'];
+                    } else {
+                        $sql = "INSERT INTO mail_traffic (month,mailuser_id,traffic) VALUES ('$tstamp',".$rec['mailuser_id'].",$mail_traffic)";
+                    }
+                    $app->dbmaster->query($sql);
+                    //echo $sql;
+                }
+            }
+
+            unset($mailbox_traffic);
+            if($last_line) file_put_contents($state_file, $last_line);
+        }
+        
+        
+        parent::onRunJob();
+    }
+    
+    /* this function is optional if it contains no custom code */
+    public function onAfterRun() {
+        global $app;
+        
+        parent::onAfterRun();
+    }
+
+}
+
+?>

server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

+<?php
+
+/*
+Copyright (c) 2013, Marius Cramer, pixcept KG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class cronjob_monitor_clamav_log extends cronjob {
+    
+    // job schedule
+    protected $_schedule = '*/5 * * * *';
+    protected $_run_at_new = true;
+	
+    private $_tools = null;
+    
+    /* this function is optional if it contains no custom code */
+    public function onPrepare() {
+        global $app;
+        
+        parent::onPrepare();
+    }
+    
+    /* this function is optional if it contains no custom code */
+    public function onBeforeRun() {
+        global $app;
+        
+        return parent::onBeforeRun();
+    }
+    
+    public function onRunJob() {
+        global $app, $conf;
+        
+        /* used for all monitor cronjobs */
+        $app->load('monitor_tools');
+        $this->_tools = new monitor_tools();
+        /* end global section for monitor cronjobs */
+        
+		/* the id of the server as int */
+		$server_id = intval($conf['server_id']);
+
+		/** The type of the data */
+		$type = 'log_clamav';
+
+		/* Get the data of the log */
+		$data = $this->_tools->_getLogData($type);
+
+		// Todo: the state should be calculated.
+		$state = 'ok';
+
+		$res = array();
+		$res['server_id'] = $server_id;
+		$res['type'] = $type;
+		$res['data'] = $data;
+		$res['state'] = $state;
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_tools->delOldRecords($res['type'], $res['server_id']);
+
+
+		/** The type of the data */
+		$type = 'log_freshclam';
+
+		/* Get the data of the log */
+		$data = $this->_tools->_getLogData($type);
+
+		/* Get the data from the LAST log-Entry.
+		 * if there can be found:
+		 * WARNING: Your ClamAV installation is OUTDATED!
+		 * then the clamav is outdated. This is a warning!
+		 */
+		$state = 'ok';
+
+		$tmp = explode("\n", $data);
+		$lastLog = array();
+		if ($tmp[sizeof($tmp) - 1] == '') {
+			/* the log ends with an empty line remove this */
+			array_pop($tmp);
+		}
+		if (strpos($tmp[sizeof($tmp) - 1], '-------------') !== false) {
+			/* the log ends with "-----..." remove this */
+			array_pop($tmp);
+		}
+		for ($i = sizeof($tmp) - 1; $i > 0; $i--) {
+			if (strpos($tmp[$i], '---------') === false) {
+				/* no delimiter found, so add this to the last-log */
+				$lastLog[] = $tmp[$i];
+			} else {
+				/* delimiter found, so there is no more line left! */
+				break;
+			}
+		}
+
+		/*
+		 * Now we have the last log in the array.
+		 * Check if the outdated-string is found...
+		 */
+		foreach ($lastLog as $line) {
+			if (strpos(strtolower($line), 'outdated') !== false) {
+				/*
+				 * Outdatet is only info, because if we set this to warning, the server is
+				 * as long in state warning, as there is a new version of ClamAv which takes
+				 * sometimes weeks!
+				 */
+				$state = $this->_tools->_setState($state, 'info');
+			}
+		}
+
+		$res = array();
+		$res['server_id'] = $server_id;
+		$res['type'] = $type;
+		$res['data'] = $data;
+		$res['state'] = $state;
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_tools->delOldRecords($res['type'], $res['server_id']);
+
+        
+        parent::onRunJob();
+    }
+    
+    /* this function is optional if it contains no custom code */
+    public function onAfterRun() {
+        global $app;
+        
+        parent::onAfterRun();
+    }
+
+}
+
+?>