You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by bi...@apache.org on 2007/07/17 14:31:10 UTC

svn commit: r556902 - in /lucene/solr/trunk/src/scripts: abc abo backup backupcleaner commit optimize readercycle rsyncd-disable rsyncd-enable scripts-util snapcleaner snapinstaller snappuller snappuller-disable snappuller-enable snapshooter

Author: billa
Date: Tue Jul 17 05:31:03 2007
New Revision: 556902

URL: http://svn.apache.org/viewvc?view=rev&rev=556902
Log:
fixed logging of elapsed time on Solaris

Modified:
    lucene/solr/trunk/src/scripts/abc
    lucene/solr/trunk/src/scripts/abo
    lucene/solr/trunk/src/scripts/backup
    lucene/solr/trunk/src/scripts/backupcleaner
    lucene/solr/trunk/src/scripts/commit
    lucene/solr/trunk/src/scripts/optimize
    lucene/solr/trunk/src/scripts/readercycle
    lucene/solr/trunk/src/scripts/rsyncd-disable
    lucene/solr/trunk/src/scripts/rsyncd-enable
    lucene/solr/trunk/src/scripts/scripts-util
    lucene/solr/trunk/src/scripts/snapcleaner
    lucene/solr/trunk/src/scripts/snapinstaller
    lucene/solr/trunk/src/scripts/snappuller
    lucene/solr/trunk/src/scripts/snappuller-disable
    lucene/solr/trunk/src/scripts/snappuller-enable
    lucene/solr/trunk/src/scripts/snapshooter

Modified: lucene/solr/trunk/src/scripts/abc
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/abc?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/abc (original)
+++ lucene/solr/trunk/src/scripts/abc Tue Jul 17 05:31:03 2007
@@ -117,7 +117,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/abo
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/abo?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/abo (original)
+++ lucene/solr/trunk/src/scripts/abo Tue Jul 17 05:31:03 2007
@@ -117,7 +117,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/backup
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/backup?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/backup (original)
+++ lucene/solr/trunk/src/scripts/backup Tue Jul 17 05:31:03 2007
@@ -74,7 +74,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/backupcleaner
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/backupcleaner?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/backupcleaner (original)
+++ lucene/solr/trunk/src/scripts/backupcleaner Tue Jul 17 05:31:03 2007
@@ -95,7 +95,7 @@
     /bin/rm -rf $1
 }
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/commit
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/commit?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/commit (original)
+++ lucene/solr/trunk/src/scripts/commit Tue Jul 17 05:31:03 2007
@@ -103,7 +103,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/optimize
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/optimize?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/optimize (original)
+++ lucene/solr/trunk/src/scripts/optimize Tue Jul 17 05:31:03 2007
@@ -104,7 +104,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/readercycle
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/readercycle?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/readercycle (original)
+++ lucene/solr/trunk/src/scripts/readercycle Tue Jul 17 05:31:03 2007
@@ -104,7 +104,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/rsyncd-disable
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/rsyncd-disable?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/rsyncd-disable (original)
+++ lucene/solr/trunk/src/scripts/rsyncd-disable Tue Jul 17 05:31:03 2007
@@ -60,7 +60,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage disabled by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/rsyncd-enable
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/rsyncd-enable?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/rsyncd-enable (original)
+++ lucene/solr/trunk/src/scripts/rsyncd-enable Tue Jul 17 05:31:03 2007
@@ -59,7 +59,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage enabled by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/scripts-util
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/scripts-util?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/scripts-util (original)
+++ lucene/solr/trunk/src/scripts/scripts-util Tue Jul 17 05:31:03 2007
@@ -53,6 +53,16 @@
     fi
 }
 
+function setStartTime
+{
+    if [[ "${OS}" == "SunOS" ]]
+    then
+        start=`perl -e "print time;"`
+    else
+        start=`date +"%s"`
+    fi
+}
+
 function timeStamp
 {
     date +'%Y/%m/%d %H:%M:%S'
@@ -69,7 +79,12 @@
 
 function logExit
 {
-    end=`date +"%s"`
+    if [[ "${OS}" == "SunOS" ]]
+    then
+        end=`perl -e "print time;"`
+    else
+        end=`date +"%s"`
+    fi
     diff=`expr $end - $start`
     echo "$(timeStamp) $1 (elapsed time: $diff sec)">>$log
     exit $2

Modified: lucene/solr/trunk/src/scripts/snapcleaner
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snapcleaner?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snapcleaner (original)
+++ lucene/solr/trunk/src/scripts/snapcleaner Tue Jul 17 05:31:03 2007
@@ -101,7 +101,7 @@
     fi
 }
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/snapinstaller
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snapinstaller?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snapinstaller (original)
+++ lucene/solr/trunk/src/scripts/snapinstaller Tue Jul 17 05:31:03 2007
@@ -104,7 +104,7 @@
     master_status_dir=${solr_root}/${master_status_dir}
 fi
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/snappuller
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snappuller?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snappuller (original)
+++ lucene/solr/trunk/src/scripts/snappuller Tue Jul 17 05:31:03 2007
@@ -156,7 +156,7 @@
     scp -q -o StrictHostKeyChecking=no ${solr_root}/logs/snappuller.status ${master_host}:${master_status_dir}/snapshot.status.`uname -n`
 }
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/snappuller-disable
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snappuller-disable?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snappuller-disable (original)
+++ lucene/solr/trunk/src/scripts/snappuller-disable Tue Jul 17 05:31:03 2007
@@ -60,7 +60,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage disabled by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/snappuller-enable
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snappuller-enable?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snappuller-enable (original)
+++ lucene/solr/trunk/src/scripts/snappuller-enable Tue Jul 17 05:31:03 2007
@@ -60,7 +60,7 @@
 
 fixUser "$@"
 
-start=`date +"%s"`
+setStartTime
 
 logMessage enabled by $oldwhoami
 logMessage command: $0 $@

Modified: lucene/solr/trunk/src/scripts/snapshooter
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snapshooter?view=diff&rev=556902&r1=556901&r2=556902
==============================================================================
--- lucene/solr/trunk/src/scripts/snapshooter (original)
+++ lucene/solr/trunk/src/scripts/snapshooter Tue Jul 17 05:31:03 2007
@@ -74,7 +74,7 @@
     data_dir=${solr_root}/${data_dir}
 fi
 
-start=`date +"%s"`
+setStartTime
 
 logMessage started by $oldwhoami
 logMessage command: $0 $@