Changeset 36480 in vbox

Timestamp:

Mar 31, 2011 1:33:42 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70878

Message:

Installer/linux+solaris: add parameters to webservice start scripts for tuning log rotation

Location:

trunk/src/VBox/Installer

Files:

• linux/vboxweb-service.sh.in (modified) (4 diffs)
• solaris/smf-vboxwebsrv.sh (modified) (3 diffs)
• solaris/virtualbox-webservice.xml (modified) (1 diff)

trunk/src/VBox/Installer/linux/vboxweb-service.sh.in

@@ -1 +1 @@
 #!/bin/sh
 #
-# Linux Additions Guest Additions service daemon init script.
-#
-# Copyright (C) 2006-2010 Oracle Corporation
+# VirtualBox web service API daemon init script.
+#
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
 
 # chkconfig: 35 35 65
-# description: VirtualBox Additions service
+# description: VirtualBox web service API
 #
 ### BEGIN INIT INFO
@@ -23 +23 @@
 # Default-Start:  2 3 4 5
 # Default-Stop:   0 1 6
-# Description:    VirtualBox Additions Service
+# Description:    VirtualBox web service API
 ### END INIT INFO
 
@@ -298 +298 @@
         [ -n "$VBOXWEB_KEEPALIVE" ]      && PARAMS="$PARAMS -k $VBOXWEB_KEEPALIVE"
         [ -n "$VBOXWEB_LOGFILE" ]        && PARAMS="$PARAMS -F $VBOXWEB_LOGFILE"
+        [ -n "$VBOXWEB_ROTATE" ]         && PARAMS="$PARAMS -R $VBOXWEB_ROTATE"
+        [ -n "$VBOXWEB_LOGSIZE" ]        && PARAMS="$PARAMS -S $VBOXWEB_LOGSIZE"
+        [ -n "$VBOXWEB_LOGINTERVAL" ]    && PARAMS="$PARAMS -I $VBOXWEB_LOGINTERVAL"
         # prevent inheriting this setting to VBoxSVC
         unset VBOX_RELEASE_LOG_DEST

trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh

@@ -2 +2 @@
 # $Id$
 
-# Copyright (C) 2008-2010 Oracle Corporation
+# Copyright (C) 2008-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
         VW_KEEPALIVE=`/usr/bin/svcprop -p config/keepalive $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_KEEPALIVE=
+        VW_ROTATE=`/usr/bin/svcprop -p config/logrotate $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_ROTATE=
+        VW_LOGSIZE=`/usr/bin/svcprop -p config/logsize $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_LOGSIZE=
+        VW_LOGINTERVAL=`/usr/bin/svcprop -p config/loginterval $SMF_FMRI 2>/dev/null`
+        [ $? != 0 ] && VW_LOGINTERVAL=
 
         # Provide sensible defaults
@@ -56 +62 @@
         [ -z "$VW_CHECK_INTERVAL" ] && VW_CHECK_INTERVAL=5
         [ -z "$VW_KEEPALIVE" ] && VW_KEEPALIVE=1000
-        exec su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --host \"$VW_HOST\" --port \"$VW_PORT\" --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\" --keepalive \"$VW_KEEPALIVE\""
+        [ -z "$VW_ROTATE" ] && VW_ROTATE=10
+        [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600
+        [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=604800
+        exec su - "$VW_USER" -c "/opt/VirtualBox/vboxwebsrv --host \"$VW_HOST\" --port \"$VW_PORT\" --timeout \"$VW_TIMEOUT\" --check-interval \"$VW_CHECK_INTERVAL\" --keepalive \"$VW_KEEPALIVE\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\""
 
         VW_EXIT=$?

trunk/src/VBox/Installer/solaris/virtualbox-webservice.xml

@@ -5 +5 @@
 # $Id$
 
-     Copyright (C) 2008-2010 Oracle Corporation
+     Copyright (C) 2008-2011 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as