logging to stdout if daemonize != yes

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/PerlDaemon/Logger.pm b/lib/PerlDaemon/Logger.pm
index 2fecd60..41984d3 100644
--- a/lib/PerlDaemon/Logger.pm
+++ b/lib/PerlDaemon/Logger.pm
@@ -14,11 +14,14 @@ sub logmsg ($$) {
 	my ($self, $msg) = @_;
 	my $conf = $self->{conf};
 	my $logfile = $conf->{'daemon.logfile'};
+        my $logline = localtime()." (PID $$): $msg\n";
 
 	open my $fh, ">>$logfile" or die "Can't write logfile $logfile: $!\n";
-	print $fh localtime()." (PID $$): $msg\n";
+	print $fh $logline;
 	close $fh;
 
+        print $logline if $conf->{'daemon.daemonize'} ne 'yes';
+
         return undef;
 }
 
diff --git a/lib/PerlDaemon/RunModules.pm b/lib/PerlDaemon/RunModules.pm
index ecdb810..4420cd7 100644
--- a/lib/PerlDaemon/RunModules.pm
+++ b/lib/PerlDaemon/RunModules.pm
@@ -24,7 +24,7 @@ sub new ($$) {
                         $logger->logmsg("Creating module instance of $name");
                         # TODO: Add eval catching jost un case for errors
                         $loadedmodules{$name} = eval "${name}->new(\$conf)";
-                        $scheduler{$name}{lastrun} = 0.0;
+                        $scheduler{$name}{lastrun} = [0,0];
                         $scheduler{$name}{interval} = $conf->{'modules.runinterval'};
                 }
 
@@ -49,8 +49,8 @@ sub do ($) {
                 $logger->warn("No modules are loaded!");
         } else {
                 while (my ($k, $v) = each %$modules) {
-                        my $now = gettimeofday;
-#$logger->logmsg(tv_interval($now, $scheduler->{$k}{lastrun}));
+                        my $now = [gettimeofday];
+                        $logger->logmsg(tv_interval($now, $scheduler->{$k}{lastrun}));
                         $logger->logmsg("Triggering $k");
                         $scheduler->{$k}{lastrun} = $now;
                         #$v->do();