Changing behaviour of create a subdirectory slony1 under $LOGDIR

Don't create subdirectory slony1 under $LOGDIR to avoid create
a unnecessary depth since we can set $LOGDIR with an appropriate path

diff --git a/tools/altperl/slon-tools.pm b/tools/altperl/slon-tools.pm
index 2e0daa6d601f01f343c37345dfb05b6bf1d78946..86c7ea24f05eb7b59216e632fac0f78f12a0476d 100644 (file)
--- a/tools/altperl/slon-tools.pm
+++ b/tools/altperl/slon-tools.pm
@@ -160,15 +160,15 @@ sub start_slon {
   $SYNC_CHECK_INTERVAL ||= 1000;
   $DEBUGLEVEL ||= 0;
   $LOG_NAME_SUFFIX ||= '%Y-%m-%d';
-  system("mkdir -p $LOGDIR/slony1/node$nodenum");
+  system("mkdir -p $LOGDIR/node$nodenum");
   my $cmd = "@@SLONBINDIR@@/slon -s $SYNC_CHECK_INTERVAL -d$DEBUGLEVEL $opts $CLUSTER_NAME '$dsn' ";
   my $logfilesuffix = POSIX::strftime( "$LOG_NAME_SUFFIX",localtime );
   chomp $logfilesuffix;
 
   if ($APACHE_ROTATOR) {
-    $cmd .= "2>&1 | $APACHE_ROTATOR \"$LOGDIR/slony1/node$nodenum/" .  $dbname . "_$logfilesuffix.log\" 10M &";
+    $cmd .= "2>&1 | $APACHE_ROTATOR \"$LOGDIR/node$nodenum/" .  $dbname . "_$logfilesuffix.log\" 10M &";
   } else {
-    $cmd .= "> $LOGDIR/slony1/node$nodenum/$dbname-$logfilesuffix.log 2>&1 &";
+    $cmd .= "> $LOGDIR/node$nodenum/$dbname-$logfilesuffix.log 2>&1 &";
   }
   print "Invoke slon for node $nodenum - $cmd\n";
   system ($cmd);

diff --git a/tools/altperl/slon_watchdog2.pl b/tools/altperl/slon_watchdog2.pl
index 49612cdf02d2bac806380e7fa3fb3df658b82f23..8a90ed1a98f45a77a0733c08d7f114427dc557b9 100644 (file)
--- a/tools/altperl/slon_watchdog2.pl
+++ b/tools/altperl/slon_watchdog2.pl
@@ -44,7 +44,7 @@ while (1) {
   } else {
     $restart = "YES";
     # See if the slon log ends with "FATAL  localListenThread: Another slon daemon is serving this node already"
-    my $lastlog=`/bin/ls -t $LOGDIR/slony1/node$nodenum/$dbname*log | head -1`;
+    my $lastlog=`/bin/ls -t $LOGDIR/node$nodenum/$dbname*log | head -1`;
     my $lastline=`tail -1 $lastlog`;
     if ($lastline =~ /Another slon daemon is serving this node already/) {
       $kick = "YES";   # Yup, need to tell slonik to reset this node