PerlDaemon:: module prefix works now

3 files changed, 6 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3b94261..33c72ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
-Do 17. Mär 08:58:18 CET 2011
+Do 17. Mär 09:10:38 CET 2011
 * Renamed DaemonLogic into RunModule
-* Added ./conf and ./lib subdirs and moved stuff into it
+* Added ./conf and ./PerlDaemon subdirs and moved stuff into it
+* Added to all Modules the PerlDaemon:: prefix
 
 Fr 11. Mär 08:54:39 CET 2011
 * New property: daemon.loopinterval
diff --git a/PerlDaemon/PerlDaemon.pl b/PerlDaemon/PerlDaemon.pl
index eb31c7c..f45f587 100644
--- a/PerlDaemon/PerlDaemon.pl
+++ b/PerlDaemon/PerlDaemon.pl
@@ -142,7 +142,7 @@ sub alive ($) {
 
 sub daemonloop ($) {
 	my $conf = shift;
-	my $rmodule = RunModule->new($conf);
+	my $rmodule = PerlDaemon::RunModule->new($conf);
 	my $loopinterval = $conf->{'daemon.loopinterval'};
 
 	my $loop = shift;
@@ -154,7 +154,7 @@ sub daemonloop ($) {
 }
 
 my $conf = readconf shift;
-$conf->{logger} = Logger->new($conf);
+$conf->{logger} = PerlDaemon::Logger->new($conf);
 
 prestartup $conf;
 daemonize $conf;
diff --git a/control.sh b/control.sh
index 5697b51..0177798 100644
--- a/control.sh
+++ b/control.sh
@@ -2,7 +2,7 @@
 
 case $1 in
 	start)
-	perl PerlDaemon.pl ./conf/perldaemon.conf
+	perl PerlDaemon/PerlDaemon.pl ./conf/perldaemon.conf
 	;;
 
 	stop)