4 files changed, 60 insertions, 40 deletions

diff --git a/DaemonLogic.pm b/DaemonLogic.pm
new file mode 100644
index 0000000..49583ed
--- /dev/null
+++ b/DaemonLogic.pm
@@ -0,0 +1,17 @@
+package DaemonLogic;
+
+sub new ($$$) {
+	my ($class, $conf) = @_;
+
+	return bless { conf => $conf }, $class;
+}
+
+sub do ($) {
+	my $self = shift;
+	my $conf = $self->{conf};
+	my $logger = $conf->{logger};
+
+	$logger->logmsg('Test');
+}
+
+1;
diff --git a/Logger.pm b/Logger.pm
new file mode 100644
index 0000000..f6c16e8
--- /dev/null
+++ b/Logger.pm
@@ -0,0 +1,40 @@
+package Logger;
+
+use Shell qw(mv);
+use POSIX qw(strftime);
+
+$| = 1;
+
+sub new ($$) {
+	my ($class, $conf) = @_;
+	return bless { conf => $conf }, $class;
+}
+
+sub logmsg ($$) {
+	my ($self, $msg) = @_;
+	my $conf = $self->{conf};
+	my $logfile = $conf->{'daemon.logfile'};
+
+	open my $fh, ">>$logfile" or die "Can't write logfile $logfile: $!\n";
+	print $fh localtime()." (PID $$): $msg\n";
+	close $fh;
+}
+
+sub err ($$) {
+	my ($self, $msg) = @_;
+	$self->logmsg($msg);
+	die "$msg\n";
+}
+
+sub rotatelog ($) {
+	my $self = shift;
+	my $conf = $self->{conf};
+	my $logfile = $conf->{'daemon.logfile'};
+
+	$self->logmsg('Rotating logfile');
+
+	my $timestr = strftime "%Y%m%d-%H%M%S", localtime();
+	mv($logfile, "$logfile.$timestr");	
+}
+
+1;
diff --git a/perldaemon.pl b/PerlDaemon.pl
index 6aa6def..a6129f2 100644
--- a/perldaemon.pl
+++ b/PerlDaemon.pl
@@ -5,47 +5,10 @@
 use strict;
 use warnings;
 
-package Logger;
-
 use Shell qw(mv);
-use POSIX qw(strftime);
-$| = 1;
-
-sub new ($$) {
-	my ($class, $conf) = @_;
-	return bless { conf => $conf }, $class;
-}
-
-sub logmsg ($$) {
-	my ($self, $msg) = @_;
-	my $conf = $self->{conf};
-	my $logfile = $conf->{'daemon.logfile'};
-
-	open my $fh, ">>$logfile" or die "Can't write logfile $logfile: $!\n";
-	print $fh localtime()." (PID $$): $msg\n";
-	close $fh;
-}
-
-sub err ($$) {
-	my ($self, $msg) = @_;
-	$self->logmsg($msg);
-	die "$msg\n";
-}
-
-sub rotatelog ($) {
-	my $self = shift;
-	my $conf = $self->{conf};
-	my $logfile = $conf->{'daemon.logfile'};
-
-	$self->logmsg('Rotating logfile');
-
-	my $timestr = strftime "%Y%m%d-%H%M%S", localtime();
-	mv($logfile, "$logfile.$timestr");	
-}
-
-package PerlDaemon;
+use POSIX qw(setsid strftime);
 
-use POSIX qw(setsid);
+use Logger;
 use DaemonLogic;
 
 $| = 1;
diff --git a/control.sh b/control.sh
index 217f841..f0bf2ec 100644
--- a/control.sh
+++ b/control.sh
@@ -2,7 +2,7 @@
 
 case $1 in
 	start)
-	perl perldaemon.pl perldaemon.conf
+	perl PerlDaemon.pl perldaemon.conf
 	;;
 
 	stop)