weathermap

Subversion Repositories:

[/] [lib/] [poller-common.php] - Diff between revs 13 and 85

Rev 13 Rev 85

Line 8... Line 8...

{ {

$mem_used = nice_bandwidth(memory_get_usage()); $mem_used = nice_bandwidth(memory_get_usage());

$mem_allowed = ini_get("memory_limit"); $mem_allowed = ini_get("memory_limit");

debug("$note: memory_get_usage() says ".$mem_used."Bytes used. Limit is ".$mem_allowed."\n"); debug("$note: memory_get_usage() says ".$mem_used."Bytes used. Limit is ".$mem_allowed."\n");

} }

}

function weathermap_cron_part($value,$checkstring)

{

// XXX - this should really handle a few more crontab niceties like */5 or 3,5-9 but this will do for now

if($checkstring == '*') return(true);

if($checkstring == sprintf("%s",$value) ) return(true);

if( preg_match("/\*\/(\d+)/",$checkstring, $matches))

{

$mod = $matches[1];

if( ($value % $mod ) == 0) return true;

}

return (false);

}

function weathermap_check_cron($time,$string)

{

if($string == '') return(true);

if($string == '*') return(true);

$lt = localtime($time, true);

list($minute,$hour,$wday,$day,$month) = preg_split('/\s+/',$string);

$matched = true;

$matched = $matched && weathermap_cron_part($lt['tm_min'],$minute);

$matched = $matched && weathermap_cron_part($lt['tm_hour'],$hour);

$matched = $matched && weathermap_cron_part($lt['tm_wday'],$wday);

$matched = $matched && weathermap_cron_part($lt['tm_mday'],$day);

$matched = $matched && weathermap_cron_part($lt['tm_mon']+1,$month);

return($matched);

} }

function weathermap_run_maps($mydir) { function weathermap_run_maps($mydir) {

global $config; global $config;

global $weathermap_debugging, $WEATHERMAP_VERSION; global $weathermap_debugging, $WEATHERMAP_VERSION;

global $weathermap_map;

global $weathermap_warncount;

global $weathermap_poller_start_time;

include_once($mydir.DIRECTORY_SEPARATOR."HTML_ImageMap.class.php"); include_once($mydir.DIRECTORY_SEPARATOR."HTML_ImageMap.class.php");

include_once($mydir.DIRECTORY_SEPARATOR."Weathermap.class.php"); include_once($mydir.DIRECTORY_SEPARATOR."Weathermap.class.php");

$total_warnings = 0;

$start_time = time();

if($weathermap_poller_start_time==0) $weathermap_poller_start_time = $start_time;

$outdir = $mydir.DIRECTORY_SEPARATOR.'output'; $outdir = $mydir.DIRECTORY_SEPARATOR.'output';

$confdir = $mydir.DIRECTORY_SEPARATOR.'configs'; $confdir = $mydir.DIRECTORY_SEPARATOR.'configs';

$mapcount = 0; $mapcount = 0;

Line 34... Line 76...

{ {

$mode_message = "Normal logging mode. Turn on DEBUG in Cacti for more information"; $mode_message = "Normal logging mode. Turn on DEBUG in Cacti for more information";

} }

$quietlogging = read_config_option("weathermap_quiet_logging"); $quietlogging = read_config_option("weathermap_quiet_logging");

// moved this outside the module_checks, so there should always be something in the logs! // moved this outside the module_checks, so there should always be something in the logs!

if($quietlogging==0) cacti_log("Weathermap $WEATHERMAP_VERSION starting - $mode_message",true,"WEATHERMAP"); if($quietlogging==0) cacti_log("Weathermap $WEATHERMAP_VERSION starting - $mode_message\n",true,"WEATHERMAP");

if(module_checks()) if(module_checks())

{ {

weathermap_memory_check("MEM Initial"); weathermap_memory_check("MEM Initial");

// move to the weathermap folder so all those relatives paths don't *have* to be absolute // move to the weathermap folder so all those relatives paths don't *have* to be absolute

$orig_cwd = getcwd(); $orig_cwd = getcwd();

chdir($mydir); chdir($mydir);

db_execute("replace into settings values('weathermap_last_start_time','".mysql_escape_string(time())."')");

// first, see if the output directory even exists // first, see if the output directory even exists

if(is_dir($outdir)) if(is_dir($outdir))

{ {

// next, make sure that we stand a chance of writing files // next, make sure that we stand a chance of writing files

Line 55... Line 99...

if($testfd) if($testfd)

{ {

fclose($testfd); fclose($testfd);

unlink($testfile); unlink($testfile);

$queryrows = db_fetch_assoc("select * from weathermap_maps where active='on' order by sortorder,id"); $queryrows = db_fetch_assoc("select m.*, g.name as groupname from weathermap_maps m,weathermap_groups g where m.group_id=g.id and active='on' order by sortorder,id");

if( is_array($queryrows) ) if( is_array($queryrows) )

{ {

debug("Iterating all maps."); debug("Iterating all maps.");

$imageformat = strtolower(read_config_option("weathermap_output_format")); $imageformat = strtolower(read_config_option("weathermap_output_format"));

$rrdtool_path = read_config_option("path_rrdtool");

foreach ($queryrows as $map) { foreach ($queryrows as $map) {

$mapfile = $confdir.DIRECTORY_SEPARATOR.$map['configfile']; // reset the warning counter

$htmlfile = $outdir.DIRECTORY_SEPARATOR."weathermap_".$map['id'].".html"; $weathermap_warncount=0;

$imagefile = $outdir.DIRECTORY_SEPARATOR."weathermap_".$map['id'].".".$imageformat; // this is what will prefix log entries for this map

$thumbimagefile = $outdir.DIRECTORY_SEPARATOR."weathermap_thumb_".$map['id'].".".$imageformat; $weathermap_map = "[Map ".$map['id']."] ".$map['configfile'];

if(file_exists($mapfile)) debug("FIRST TOUCH\n");

if(weathermap_check_cron($weathermap_poller_start_time,$map['schedule']))

{ {

if($quietlogging==0) warn("Map: $mapfile -> $htmlfile & $imagefile"); $mapfile = $confdir.DIRECTORY_SEPARATOR.$map['configfile'];

weathermap_memory_check("MEM starting $mapcount"); $htmlfile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".html";

$wmap = new Weathermap; $imagefile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".".$imageformat;

$wmap->context = "cacti"; $thumbimagefile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".thumb.".$imageformat;

// we can grab the rrdtool path from Cacti's config, in this case if(file_exists($mapfile))

$wmap->rrdtool = read_config_option("path_rrdtool"); {

if($quietlogging==0) warn("Map: $mapfile -> $htmlfile & $imagefile\n",TRUE);

db_execute("replace into settings values('weathermap_last_started_file','".mysql_escape_string($weathermap_map)."')");

$map_start = time();

weathermap_memory_check("MEM starting $mapcount");

$wmap = new Weathermap;

$wmap->context = "cacti";

$wmap->ReadConfig($mapfile); // we can grab the rrdtool path from Cacti's config, in this case

weathermap_memory_check("MEM postread $mapcount"); $wmap->rrdtool = $rrdtool_path;

$wmap->ReadData();

weathermap_memory_check("MEM postdata $mapcount");

// $wmap->imageuri = $config['url_path'].'/plugins/weathermap/output/weathermap_'.$map['id'].".".$imageformat; $wmap->ReadConfig($mapfile);

$wmap->imageuri = 'output/weathermap_'.$map['id'].".".$imageformat;

if($quietlogging==0) warn("About to write image file. If this is the last message in your log, increase memory_limit in php.ini"); $wmap->add_hint("mapgroup",$map['groupname']);

weathermap_memory_check("MEM pre-render $mapcount"); $wmap->add_hint("mapgroupextra",($map['group_id'] ==1 ? "" : $map['groupname'] ));

$wmap->DrawMap($imagefile,$thumbimagefile,read_config_option("weathermap_thumbsize")); # in the order of precedence - global extras, group extras, and finally map extras

$queries = array();

if($quietlogging==0) warn("Wrote map to $imagefile and $thumbimagefile"); $queries[] = "select * from weathermap_settings where mapid=0 and groupid=0";

$fd = @fopen($htmlfile, 'w'); $queries[] = "select * from weathermap_settings where mapid=0 and groupid=".intval($map['group_id']);

if($fd != FALSE) $queries[] = "select * from weathermap_settings where mapid=".intval($map['id']);

{

fwrite($fd, $wmap->MakeHTML('weathermap_'.$map['id'].'_imap')); foreach ($queries as $sql)

fclose($fd); {

debug("Wrote HTML to $htmlfile"); $settingrows = db_fetch_assoc($sql);

} if( is_array($settingrows) && count($settingrows) > 0 )

else {

{

if(file_exists($htmlfile)) foreach ($settingrows as $setting)

{

if($setting['mapid']==0 && $setting['groupid']==0)

{

debug("Setting additional (all maps) option: ".$setting['optname']." to '".$setting['optvalue']."'\n");

$wmap->add_hint($setting['optname'],$setting['optvalue']);

}

elseif($setting['groupid']!=0)

{

debug("Setting additional (all maps in group) option: ".$setting['optname']." to '".$setting['optvalue']."'\n");

$wmap->add_hint($setting['optname'],$setting['optvalue']);

}

else

{ debug("Setting additional map-global option: ".$setting['optname']." to '".$setting['optvalue']."'\n");

$wmap->add_hint($setting['optname'],$setting['optvalue']);

}

}

}

}

weathermap_memory_check("MEM postread $mapcount");

$wmap->ReadData();

weathermap_memory_check("MEM postdata $mapcount");

// why did I change this before? It's useful...

// $wmap->imageuri = $config['url_path'].'/plugins/weathermap/output/weathermap_'.$map['id'].".".$imageformat;

$wmap->imageuri = 'weathermap-cacti-plugin.php?action=viewimage&id='.$map['filehash']."&time=".time();

if($quietlogging==0) warn("About to write image file. If this is the last message in your log, increase memory_limit in php.ini [WMPOLL01]\n",TRUE);

weathermap_memory_check("MEM pre-render $mapcount");

$wmap->DrawMap($imagefile,$thumbimagefile,read_config_option("weathermap_thumbsize"));

if($quietlogging==0) warn("Wrote map to $imagefile and $thumbimagefile\n",TRUE);

$fd = @fopen($htmlfile, 'w');

if($fd != FALSE)

{ {

warn("Failed to overwrite $htmlfile - permissions of existing file are wrong?\n"); fwrite($fd, $wmap->MakeHTML('weathermap_'.$map['filehash'].'_imap'));

fclose($fd);

debug("Wrote HTML to $htmlfile");

} }

else else

{ {

warn("Failed to create $htmlfile - permissions of output directory are wrong?\n"); if(file_exists($htmlfile))

{

warn("Failed to overwrite $htmlfile - permissions of existing file are wrong? [WMPOLL02]\n");

}

else

{

warn("Failed to create $htmlfile - permissions of output directory are wrong? [WMPOLL03]\n");

}

} }

}

db_execute("update weathermap_maps set titlecache='".mysql_real_escape_string($wmap->title)."' where id=".$map['id']); $processed_title = $wmap->ProcessString($wmap->title,$wmap);

unset($wmap); db_execute("update weathermap_maps set titlecache='".mysql_real_escape_string($processed_title)."' where id=".intval($map['id']));

weathermap_memory_check("MEM after $mapcount"); if(intval($wmap->thumb_width) > 0)

$mapcount++; {

db_execute("update weathermap_maps set thumb_width=".intval($wmap->thumb_width).", thumb_height=".intval($wmap->thumb_height)." where id=".intval($map['id']));

}

unset($wmap);

$map_duration = time() - $map_start;

debug("TIME: $mapfile took $map_duration seconds.\n");

weathermap_memory_check("MEM after $mapcount");

$mapcount++;

db_execute("replace into settings values('weathermap_last_finished_file','".mysql_escape_string($weathermap_map)."')");

}

else

{

warn("Mapfile $mapfile is not readable or doesn't exist [WMPOLL04]\n");

}

db_execute("update weathermap_maps set warncount=".intval($weathermap_warncount)." where id=".intval($map['id']));

$total_warnings += $weathermap_warncount;

$weathermap_warncount = 0;

$weathermap_map="";

} }

else else

{ {

warn("Mapfile $mapfile is not readable or doesn't exist"); debug("Skipping ".$map['id']." (".$map['configfile'].") due to schedule.\n");

} }

} }

debug("Iterated all $mapcount maps."); debug("Iterated all $mapcount maps.\n");

} }

else else

{ {

if($quietlogging==0) warn("No activated maps found."); if($quietlogging==0) warn("No activated maps found. [WMPOLL05]\n");

} }

} }

else else

{ {

warn("Output directory ($outdir) isn't writable (tried to create '$testfile'). No maps created. You probably need to make it writable by the poller process (like you did with the RRA directory)"); warn("Output directory ($outdir) isn't writable (tried to create '$testfile'). No maps created. You probably need to make it writable by the poller process (like you did with the RRA directory) [WMPOLL06]\n");

} }

} }

else else

{ {

warn("Output directory ($outdir) doesn't exist!. No maps created. You probably need to create that directory, and make it writable by the poller process (like you did with the RRA directory)"); warn("Output directory ($outdir) doesn't exist!. No maps created. You probably need to create that directory, and make it writable by the poller process (like you did with the RRA directory) [WMPOLL07]\n");

} }

weathermap_memory_check("MEM Final"); weathermap_memory_check("MEM Final");

chdir($orig_cwd); chdir($orig_cwd);

if($quietlogging==0) warn("Weathermap $WEATHERMAP_VERSION run complete - $mapcount maps were run"); $duration = time() - $start_time;

$stats_string = date(DATE_RFC822) . ": $mapcount maps were run in $duration seconds with $total_warnings warnings.";

if($quietlogging==0) warn("STATS: Weathermap $WEATHERMAP_VERSION run complete - $stats_string\n", TRUE);

db_execute("replace into settings values('weathermap_last_stats','".mysql_escape_string($stats_string)."')");

db_execute("replace into settings values('weathermap_last_finish_time','".mysql_escape_string(time())."')");

} }

else else

{ {

warn("Required modules for PHP Weathermap $WEATHERMAP_VERSION were not present. Not running."); warn("Required modules for PHP Weathermap $WEATHERMAP_VERSION were not present. Not running. [WMPOLL08]\n");

} }

} }

// vim:ts=4:sw=4: // vim:ts=4:sw=4:

?> ?>

-Rev 13
+Rev 85
 Line 8...
         {
                 $mem_used = nice_bandwidth(memory_get_usage());
                 $mem_allowed = ini_get("memory_limit");
                 debug("$note: memory_get_usage() says ".$mem_used."Bytes used. Limit is ".$mem_allowed."\n");
         }
+}
+function weathermap_cron_part($value,$checkstring)
+{
+        // XXX - this should really handle a few more crontab niceties like */5 or 3,5-9 but this will do for now
+        if($checkstring == '*') return(true);
+        if($checkstring == sprintf("%s",$value) ) return(true);
+        if( preg_match("/\*\/(\d+)/",$checkstring, $matches))
+        {
+                $mod = $matches[1];
+                if( ($value % $mod ) == 0) return true;
+        }
+        return (false);
+}
+function weathermap_check_cron($time,$string)
+{
+        if($string == '') return(true);
+        if($string == '*') return(true);
+        $lt = localtime($time, true);
+        list($minute,$hour,$wday,$day,$month) = preg_split('/\s+/',$string);
+        $matched = true;
+        $matched = $matched && weathermap_cron_part($lt['tm_min'],$minute);
+        $matched = $matched && weathermap_cron_part($lt['tm_hour'],$hour);
+        $matched = $matched && weathermap_cron_part($lt['tm_wday'],$wday);
+        $matched = $matched && weathermap_cron_part($lt['tm_mday'],$day);
+        $matched = $matched && weathermap_cron_part($lt['tm_mon']+1,$month);
+        return($matched);
 }
 function weathermap_run_maps($mydir) {
         global $config;
         global $weathermap_debugging, $WEATHERMAP_VERSION;
+        global $weathermap_map;
+        global $weathermap_warncount;
+        global $weathermap_poller_start_time;
         include_once($mydir.DIRECTORY_SEPARATOR."HTML_ImageMap.class.php");
         include_once($mydir.DIRECTORY_SEPARATOR."Weathermap.class.php");
+        $total_warnings = 0;
+        $start_time = time();
+        if($weathermap_poller_start_time==0) $weathermap_poller_start_time = $start_time;
         $outdir = $mydir.DIRECTORY_SEPARATOR.'output';
         $confdir = $mydir.DIRECTORY_SEPARATOR.'configs';
         $mapcount = 0;
-Line 34...
+Line 76...
         {
                 $mode_message = "Normal logging mode. Turn on DEBUG in Cacti for more information";
         }
         $quietlogging = read_config_option("weathermap_quiet_logging");
         // moved this outside the module_checks, so there should always be something in the logs!
-        if($quietlogging==0) cacti_log("Weathermap $WEATHERMAP_VERSION starting - $mode_message",true,"WEATHERMAP");
+        if($quietlogging==0) cacti_log("Weathermap $WEATHERMAP_VERSION starting - $mode_message\n",true,"WEATHERMAP");
         if(module_checks())
         {
                 weathermap_memory_check("MEM Initial");
                 // move to the weathermap folder so all those relatives paths don't *have* to be absolute
                 $orig_cwd = getcwd();
                 chdir($mydir);
+                db_execute("replace into settings values('weathermap_last_start_time','".mysql_escape_string(time())."')");
                 // first, see if the output directory even exists
                 if(is_dir($outdir))
                 {
                         // next, make sure that we stand a chance of writing files
-Line 55...
+Line 99...
                         if($testfd)
                         {
                                 fclose($testfd);
                                 unlink($testfile);
-                                $queryrows = db_fetch_assoc("select * from weathermap_maps where active='on' order by sortorder,id");
+                                $queryrows = db_fetch_assoc("select m.*, g.name as groupname from weathermap_maps m,weathermap_groups g where m.group_id=g.id and active='on' order by sortorder,id");
                                 if( is_array($queryrows) )
                                 {
                                         debug("Iterating all maps.");
                                         $imageformat = strtolower(read_config_option("weathermap_output_format"));
+                                        $rrdtool_path =  read_config_option("path_rrdtool");
                                         foreach ($queryrows as $map) {
-                                                $mapfile = $confdir.DIRECTORY_SEPARATOR.$map['configfile'];
+                                                // reset the warning counter
-                                                $htmlfile = $outdir.DIRECTORY_SEPARATOR."weathermap_".$map['id'].".html";
+                                                $weathermap_warncount=0;
-                                                $imagefile = $outdir.DIRECTORY_SEPARATOR."weathermap_".$map['id'].".".$imageformat;
+                                                // this is what will prefix log entries for this map
-                                                $thumbimagefile = $outdir.DIRECTORY_SEPARATOR."weathermap_thumb_".$map['id'].".".$imageformat;
+                                                $weathermap_map = "[Map ".$map['id']."] ".$map['configfile'];
-                                                if(file_exists($mapfile))
+                                                debug("FIRST TOUCH\n");
+                                                if(weathermap_check_cron($weathermap_poller_start_time,$map['schedule']))
                                                 {
-                                                        if($quietlogging==0) warn("Map: $mapfile -> $htmlfile & $imagefile");
+                                                        $mapfile = $confdir.DIRECTORY_SEPARATOR.$map['configfile'];
-                                                        weathermap_memory_check("MEM starting $mapcount");
+                                                        $htmlfile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".html";
-                                                        $wmap = new Weathermap;
+                                                        $imagefile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".".$imageformat;
-                                                        $wmap->context = "cacti";
+                                                        $thumbimagefile = $outdir.DIRECTORY_SEPARATOR.$map['filehash'].".thumb.".$imageformat;
-                                                        // we can grab the rrdtool path from Cacti's config, in this case
+                                                        if(file_exists($mapfile))
-                                                        $wmap->rrdtool  = read_config_option("path_rrdtool");
+                                                        {
+                                                                if($quietlogging==0) warn("Map: $mapfile -> $htmlfile & $imagefile\n",TRUE);
+                                                                db_execute("replace into settings values('weathermap_last_started_file','".mysql_escape_string($weathermap_map)."')");
+                                                                $map_start = time();
+                                                                weathermap_memory_check("MEM starting $mapcount");
+                                                                $wmap = new Weathermap;
+                                                                $wmap->context = "cacti";
-                                                        $wmap->ReadConfig($mapfile);
+                                                                // we can grab the rrdtool path from Cacti's config, in this case
-                                                        weathermap_memory_check("MEM postread $mapcount");
+                                                                $wmap->rrdtool  = $rrdtool_path;
-                                                        $wmap->ReadData();
-                                                        weathermap_memory_check("MEM postdata $mapcount");
-                                                        // $wmap->imageuri = $config['url_path'].'/plugins/weathermap/output/weathermap_'.$map['id'].".".$imageformat;
+                                                                $wmap->ReadConfig($mapfile);
-                                                        $wmap->imageuri = 'output/weathermap_'.$map['id'].".".$imageformat;
-                                                        if($quietlogging==0) warn("About to write image file. If this is the last message in your log, increase memory_limit in php.ini");
+                                                                $wmap->add_hint("mapgroup",$map['groupname']);
-                                                        weathermap_memory_check("MEM pre-render $mapcount");
+                                                                $wmap->add_hint("mapgroupextra",($map['group_id'] ==1 ? "" : $map['groupname'] ));
-                                                        $wmap->DrawMap($imagefile,$thumbimagefile,read_config_option("weathermap_thumbsize"));
+                                                                # in the order of precedence - global extras, group extras, and finally map extras
+                                                                $queries = array();
-                                                        if($quietlogging==0) warn("Wrote map to $imagefile and $thumbimagefile");
+                                                                $queries[] = "select * from weathermap_settings where mapid=0 and groupid=0";
-                                                        $fd = @fopen($htmlfile, 'w');
+                                                                $queries[] = "select * from weathermap_settings where mapid=0 and groupid=".intval($map['group_id']);
-                                                        if($fd != FALSE)
+                                                                $queries[] = "select * from weathermap_settings where mapid=".intval($map['id']);
-                                                        {
-                                                                fwrite($fd, $wmap->MakeHTML('weathermap_'.$map['id'].'_imap'));
+                                                                foreach ($queries as $sql)
-                                                                fclose($fd);
+                                                                {
-                                                                debug("Wrote HTML to $htmlfile");
+                                                                        $settingrows = db_fetch_assoc($sql);
-                                                        }
+                                                                        if( is_array($settingrows) && count($settingrows) > 0 )
-                                                        else
+                                                                        {
-                                                        {
-                                                                if(file_exists($htmlfile))
+                                                                        foreach ($settingrows as $setting)
+                                                                        {
+                                                                                if($setting['mapid']==0 && $setting['groupid']==0)
+                                                                                {
+                                                                                        debug("Setting additional (all maps) option: ".$setting['optname']." to '".$setting['optvalue']."'\n");
+                                                                                        $wmap->add_hint($setting['optname'],$setting['optvalue']);
+                                                                                }
+                                                                                elseif($setting['groupid']!=0)
+                                                                                {
+                                                                                        debug("Setting additional (all maps in group) option: ".$setting['optname']." to '".$setting['optvalue']."'\n");
+                                                                                        $wmap->add_hint($setting['optname'],$setting['optvalue']);
+                                                                                }
+                                                                                else
+                                                                                {       debug("Setting additional map-global option: ".$setting['optname']." to '".$setting['optvalue']."'\n");
+                                                                                        $wmap->add_hint($setting['optname'],$setting['optvalue']);
+                                                                                }
+                                                                        }
+                                                                        }
+                                                                }
+                                                                weathermap_memory_check("MEM postread $mapcount");
+                                                                $wmap->ReadData();
+                                                                weathermap_memory_check("MEM postdata $mapcount");
+                                                                // why did I change this before? It's useful...
+                                                                // $wmap->imageuri = $config['url_path'].'/plugins/weathermap/output/weathermap_'.$map['id'].".".$imageformat;
+                                                                $wmap->imageuri = 'weathermap-cacti-plugin.php?action=viewimage&id='.$map['filehash']."&time=".time();
+                                                                if($quietlogging==0) warn("About to write image file. If this is the last message in your log, increase memory_limit in php.ini [WMPOLL01]\n",TRUE);
+                                                                weathermap_memory_check("MEM pre-render $mapcount");
+                                                                $wmap->DrawMap($imagefile,$thumbimagefile,read_config_option("weathermap_thumbsize"));
+                                                                if($quietlogging==0) warn("Wrote map to $imagefile and $thumbimagefile\n",TRUE);
+                                                                $fd = @fopen($htmlfile, 'w');
+                                                                if($fd != FALSE)
                                                                 {
-                                                                        warn("Failed to overwrite $htmlfile - permissions of existing file are wrong?\n");
+                                                                        fwrite($fd, $wmap->MakeHTML('weathermap_'.$map['filehash'].'_imap'));
+                                                                        fclose($fd);
+                                                                        debug("Wrote HTML to $htmlfile");
                                                                 }
                                                                 else
                                                                 {
-                                                                        warn("Failed to create $htmlfile - permissions of output directory are wrong?\n");
+                                                                        if(file_exists($htmlfile))
+                                                                        {
+                                                                                warn("Failed to overwrite $htmlfile - permissions of existing file are wrong? [WMPOLL02]\n");
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                                warn("Failed to create $htmlfile - permissions of output directory are wrong? [WMPOLL03]\n");
+                                                                        }
                                                                 }
-                                                        }
-                                                        db_execute("update weathermap_maps set titlecache='".mysql_real_escape_string($wmap->title)."' where id=".$map['id']);
+                                                                $processed_title = $wmap->ProcessString($wmap->title,$wmap);
-                                                        unset($wmap);
+                                                                db_execute("update weathermap_maps set titlecache='".mysql_real_escape_string($processed_title)."' where id=".intval($map['id']));
-                                                        weathermap_memory_check("MEM after $mapcount");
+                                                                if(intval($wmap->thumb_width) > 0)
-                                                        $mapcount++;
+                                                                {
+                                                                        db_execute("update weathermap_maps set thumb_width=".intval($wmap->thumb_width).", thumb_height=".intval($wmap->thumb_height)." where id=".intval($map['id']));
+                                                                }
+                                                                unset($wmap);
+                                                                $map_duration = time() - $map_start;
+                                                                debug("TIME: $mapfile took $map_duration seconds.\n");
+                                                                weathermap_memory_check("MEM after $mapcount");
+                                                                $mapcount++;
+                                                                db_execute("replace into settings values('weathermap_last_finished_file','".mysql_escape_string($weathermap_map)."')");
+                                                        }
+                                                        else
+                                                        {
+                                                                warn("Mapfile $mapfile is not readable or doesn't exist [WMPOLL04]\n");
+                                                        }
+                                                        db_execute("update weathermap_maps set warncount=".intval($weathermap_warncount)." where id=".intval($map['id']));
+                                                        $total_warnings += $weathermap_warncount;
+                                                        $weathermap_warncount = 0;
+                                                        $weathermap_map="";
                                                 }
                                                 else
                                                 {
-                                                        warn("Mapfile $mapfile is not readable or doesn't exist");
+                                                        debug("Skipping ".$map['id']." (".$map['configfile'].") due to schedule.\n");
                                                 }
                                         }
-                                        debug("Iterated all $mapcount maps.");
+                                        debug("Iterated all $mapcount maps.\n");
                                 }
                                 else
                                 {
-                                        if($quietlogging==0) warn("No activated maps found.");
+                                        if($quietlogging==0) warn("No activated maps found. [WMPOLL05]\n");
                                 }
                         }
                         else
                         {
-                                warn("Output directory ($outdir) isn't writable (tried to create '$testfile'). No maps created. You probably need to make it writable by the poller process (like you did with the RRA directory)");
+                                warn("Output directory ($outdir) isn't writable (tried to create '$testfile'). No maps created. You probably need to make it writable by the poller process (like you did with the RRA directory) [WMPOLL06]\n");
                         }
                 }
                 else
                 {
-                        warn("Output directory ($outdir) doesn't exist!. No maps created. You probably need to create that directory, and make it writable by the poller process (like you did with the RRA directory)");
+                        warn("Output directory ($outdir) doesn't exist!. No maps created. You probably need to create that directory, and make it writable by the poller process (like you did with the RRA directory) [WMPOLL07]\n");
                 }
                 weathermap_memory_check("MEM Final");
                 chdir($orig_cwd);
-                if($quietlogging==0) warn("Weathermap $WEATHERMAP_VERSION run complete - $mapcount maps were run");
+                $duration = time() - $start_time;
+                $stats_string = date(DATE_RFC822) . ": $mapcount maps were run in $duration seconds with $total_warnings warnings.";
+                if($quietlogging==0) warn("STATS: Weathermap $WEATHERMAP_VERSION run complete - $stats_string\n", TRUE);
+                db_execute("replace into settings values('weathermap_last_stats','".mysql_escape_string($stats_string)."')");
+                db_execute("replace into settings values('weathermap_last_finish_time','".mysql_escape_string(time())."')");
         }
         else
         {
-                warn("Required modules for PHP Weathermap $WEATHERMAP_VERSION were not present. Not running.");
+                warn("Required modules for PHP Weathermap $WEATHERMAP_VERSION were not present. Not running. [WMPOLL08]\n");
         }
 }
 // vim:ts=4:sw=4:
 ?>