ispman/lib create_domain_directories.lib,1.6,1.7 create_home_directory.lib,1.8,1.9 create_vhost_directories.lib,1.14,1.15 dns.bind8.lib,1.18,1.19

Update of /cvsroot/ispman/ispman/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31786/lib

Modified Files:
	create_domain_directories.lib create_home_directory.lib 
	create_vhost_directories.lib dns.bind8.lib 
Log Message:
adjustments for logging change in ispman-agent

Index: create_domain_directories.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/create_domain_directories.lib,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- create_domain_directories.lib	30 May 2004 23:35:36 -0000	1.6
+++ create_domain_directories.lib	1 Aug 2004 21:16:42 -0000	1.7
@@ -11,7 +11,7 @@
     }
 
     for (@commands) {
-        log_message("System: $_");
+        logsay("System: $_");
         system($_);
     }
 }

Index: dns.bind8.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/dns.bind8.lib,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dns.bind8.lib	21 Jun 2004 20:07:31 -0000	1.18
+++ dns.bind8.lib	1 Aug 2004 21:16:42 -0000	1.19
@@ -6,6 +6,7 @@
 sub make_named_conf {
     my $zone  = shift;
     my $dirty = 0;
+    my $msg;
 
     checkDirectories();
     $domains = $ispman->makeDomainHash( $ispman->getDomains($filter) );
@@ -14,13 +15,13 @@
     print CONF cat($namedConfHeaderFile);
 
     for $domain ( sort { $domains->{$a} cmp $domains->{$b} } keys %$domains ) {
-        $ispman->log_event("Configuring named for $domain");
+        logsay("Configuring named for $domain");
         my $domainInfo = $ispman->getDomainInfo($domain);
         my $domaintype = $domainInfo->{'ispmanDomainType'};
 
-        print "domain: $domain, type: $domaintype";
-        print ",        filter: $filter" if ($filter);
-        print "\n";
+        $msg="  domain: $domain, type: $domaintype";
+        $msg.=", filter: $filter" if ($filter);
+        logsay($msg);
 
         if ( $domaintype eq "slave" ) {
             my $entry =
@@ -63,7 +64,7 @@
     # if zonefile exists but wasn't written here, we delete it
     # because the domain must have been deleted
     if ( $zone ne "ALL" && $dirty == 0 && -e "$namedPriDir/$zone" ) {
-        log_message("Deleting zone file for $zone\n");
+        logsay("Deleting zone file for $zone");
         unlink "$namedPriDir/$zone";
     }
 }
@@ -75,7 +76,7 @@
           or die "$user not in passwd file";
 
         unless ( -d $_ ) {
-            log_message("Directory $_ did not existed. I am creating it now\n");
+            logsay("Directory $_ did not existed. I am creating it now");
             mkpath($_);
             chown $uid, $gid, $_;
         }
@@ -154,8 +155,6 @@
         }
 
         close(REV);
-
-        print "Closed Rev file";
     }
     undef $rev;
 }
@@ -163,7 +162,7 @@
 sub writeZoneFile {
     my $domain = shift;
     open "ZONE", ">$namedPriDir/$domain" || die "$!";
-    log_message("Writing zone file for $domain\n");
+    logsay("Writing zone file for $domain");
     my $soa = $ispman->getSOA($domain);
 
     if ($soa) {

Index: create_home_directory.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/create_home_directory.lib,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- create_home_directory.lib	30 May 2004 23:35:36 -0000	1.8
+++ create_home_directory.lib	1 Aug 2004 21:16:42 -0000	1.9
@@ -13,7 +13,7 @@
     }
 
     for (@commands) {
-        log_message("System: $_");
+        logsay("System: $_");
         system($_);
     }
 

Index: create_vhost_directories.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/create_vhost_directories.lib,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- create_vhost_directories.lib	28 Jun 2004 19:34:26 -0000	1.14
+++ create_vhost_directories.lib	1 Aug 2004 21:16:42 -0000	1.15
@@ -26,7 +26,7 @@
     }
 
     for (@commands) {
-        log_message("System: $_");
+        logsay("System: $_");
         system($_) == 0 or return "ERROR: $?";
     }
 



-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com