OS-2635 move /var/log/{fw,vm} logs to name that includes timestamp an…

…d nodename
TritonDataCenter · Nov 27, 2013 · 3d39442 · 3d39442
1 parent eaf2835
commit 3d39442
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/overlay/generic/etc/logadm.conf b/overlay/generic/etc/logadm.conf
@@ -42,8 +42,8 @@
 /var/lp/logs/lpsched -C 2 -N -t '$file.$N'
 /var/fm/fmd/errlog -N -s 2m -M '/usr/sbin/fmadm -q rotate errlog && mv /var/fm/fmd/errlog.0- $nfile'
 /var/fm/fmd/fltlog -N -A 6m -s 10m -M '/usr/sbin/fmadm -q rotate fltlog && mv /var/fm/fmd/fltlog.0- $nfile'
-vm_logs /var/log/vm/vm.log -b '/usr/vm/sbin/rotate-logs.sh -m /var/log/vm/logs/ /var/log/vm/vm.log' -C 168 -S 1g -p 1h
-fw_logs /var/log/fw/fw.log -b '/usr/vm/sbin/rotate-logs.sh -i /var/log/fw/logs/ /var/log/fw/fw.log' -C 168 -S 1g -p 1h
+vm_logs /var/log/vm/vmadm.log -b '/usr/vm/sbin/rotate-logs.sh -m /var/log/vm/logs/ /var/log/vm/vmadm.log' -t '/var/log/vm/vmadm_$nodename_%FT%H:%M:%S.log' -C 168 -S 1g -p 1h
+fw_logs /var/log/fw/fwadm.log -b '/usr/vm/sbin/rotate-logs.sh -i /var/log/fw/logs/ /var/log/fw/fwadm.log' -t '/var/log/fw/fwadm_$nodename_%FT%H:%M:%S.log' -C 168 -S 1g -p 1h
 /var/log/*.log -C 2 -s 5m -c
 /var/log/*.debug -C 2 -s 5m -c
 smf_logs /var/svc/log/*.log -C 8 -s 1m -c

diff --git a/src/vm/smf/system-vmadmd b/src/vm/smf/system-vmadmd
@@ -32,12 +32,6 @@ PATH=/usr/sbin:/usr/bin; export PATH
 case "$1" in
 'start')
 
-    # ensure /var/log/vm exists for VM.log logs
-    mkdir -p /var/log/vm/logs
-
-    # need to create this file so rotation works
-    touch /var/log/vm/vm.log
-
     if [[ $(zpool list -H | wc -l | tr -d '[:space:]') == "0" ]]; then
         # no zpool yet, can't manage vms on an unsetup compute node.
         /usr/sbin/svcadm disable $SMF_FMRI