From 2d4eb4dbbd315c90def189efac54402c2f60157a Mon Sep 17 00:00:00 2001
From: Jakub Cegan <cegan@ics.muni.cz>
Date: Tue, 19 Mar 2013 20:19:21 +0100
Subject: [PATCH] Task #613 pridano cmd
* ted uz opravdu pridano ...
---
src/contrib/wardenWatchdog/WardenWatchdog.pm | 8 +++----
src/contrib/wardenWatchdog/wardenWatchdog.pl | 24 +++++++++++++++++++-
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/contrib/wardenWatchdog/WardenWatchdog.pm b/src/contrib/wardenWatchdog/WardenWatchdog.pm
index 1332532..a500231 100644
--- a/src/contrib/wardenWatchdog/WardenWatchdog.pm
+++ b/src/contrib/wardenWatchdog/WardenWatchdog.pm
@@ -274,8 +274,8 @@ sub run{
while ($i < scalar(@sql_queries)) {
my ($rc,$err) = send_query(\$dbh,\@sql_queries,\%bad_events);
if (!$rc){
- print "Warden watchdog - $err\n";
- #syslog("err|Warden watchdog - $err\n");
+ #print "Warden watchdog - $err\n";
+ syslog("err|Warden watchdog - $err\n");
}
$i++;
}
@@ -284,8 +284,8 @@ sub run{
my %input = (contact => $contact, domain => $domain_name, text => $text, subject => $email_subject, email_conf => $email_server_conf);
my ($rc,$err) = send_report(\%input);
if (!$rc){
- print $err;
- #syslog("err|Warden client - networkReporter $err\n");
+ #print $err;
+ syslog("err|Warden client - networkReporter $err\n");
}
}
diff --git a/src/contrib/wardenWatchdog/wardenWatchdog.pl b/src/contrib/wardenWatchdog/wardenWatchdog.pl
index 5c8a258..bf1ccca 100755
--- a/src/contrib/wardenWatchdog/wardenWatchdog.pl
+++ b/src/contrib/wardenWatchdog/wardenWatchdog.pl
@@ -10,6 +10,28 @@ use strict;
use warnings;
use WardenWatchdog;
+use Getopt::Long;
+
+sub help {
+ my $help =" USAGE: ./wardenWatchdog.pl -c '/path/WardenWatchdog.conf' -i 7
+
+ OPTIONS
+ -c conf configuration file name and path
+ -i interval interval in days from now back to the past
+ ";
+ print $help;
+ return 1;
+}
+
+my ($help, $config, $interval);
+if (@ARGV < 3 || defined($help) || !GetOptions('help|?|h' => \$help, 'c|conf=s' => \$config, 'i|interval=i' => \$interval)){
+ help();
+}
+else{
+ my ($rc,$err) = WardenWatchdog::run($config,$interval);
+ if(!$rc){
+ print "WardenWatchdog error: $err";
+ }
+}
-WardenWatchdog::run('WardenWatchdog.conf',7);
1;
--
GitLab