Changeset 30250 for trunk/tools/czarpoll.pl

Timestamp:

Jan 12, 2011, 2:52:40 PM (16 years ago)

Author:

rhenders

Message:

Long overdue introduction of XML config file for czartool

File:

• trunk/tools/czarpoll.pl (modified) (5 diffs)

trunk/tools/czarpoll.pl

@@ -1 +1 @@
 #!/usr/bin/perl -w
+
+###########################################################################
+#
+# Main polling program for czartool. Grabs stuff from various sources every few minutes.
+#
+###########################################################################
 
 use warnings;
@@ -7 +13 @@
 
 # local classes
+use czartool::Config;
 use czartool::CzarDb;
 use czartool::Gpc1Db;
@@ -17 +24 @@
 
 my $period = 60;
-my $czarDbName = "czardb"; # TODO variables for other Db stuff, host etc
 my $save_temps = 0;
 
 GetOptions (
         "period|p=s" => \$period, # TODO more Db args
-        "dbname|d=s" => \$czarDbName,
         );
 
-my $czarDb = new czartool::CzarDb($czarDbName, "ippdb01", "ipp", "ipp", 0, $save_temps); # TODO last arg here is save_temps, should get as arg
-my $gpc1Db = new czartool::Gpc1Db("gpc1", "ippdb01", "ippuser", "ippuser");
+my $config = new czartool::Config();
+my $czarDb = $config->getCzarDbInstance(); 
+my $gpc1Db = $config->getGpc1Instance;
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
-my $plotter = czartool::Plotter->new_file($gpc1Db, $czarDb, "/tmp", $save_temps); 
+my $plotter = czartool::Plotter->new_file($config, "/tmp", $save_temps); 
 my $burntool = new czartool::Burntool();
 
-
-$czarDb->setDateFormat("%Y%m%d-%H%i%s");
 
 my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
@@ -110 +114 @@
     my $today = undef;
     my $yesterday = undef;
-    my $newDayTime = "18:00";
+    my $newDayTime = $config->getMetricsStartTime();
     my $lastDayDailyTasks = "2010-01-01";
 
@@ -136 +140 @@
                 print "* Creating metrics for last 24 hours\n";
                 # TODO hardcoded path needs to be in config
-                my $dayMetrics = new czartool::DayMetrics($gpc1Db, 
-                        $czarDb, 
-                        "/data/ipp004.0/ipp/ippMetrics/", 
-                        1, 0, $today); 
+                my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $today); 
                 $dayMetrics->writeHTML();
 
                 # now update metrics index page
-                my $metricsIndex = new czartool::MetricsIndex($gpc1Db, 
-                        $czarDb, 
-                        "/data/ipp004.0/ipp/ippMetrics/", 
-                        1, 0); 
+                my $metricsIndex = new czartool::MetricsIndex($config, 1, 0); 
                 $metricsIndex->writeHTML();