Little core7 fix because of mbmon restart probs

Added the collectd to the log view

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1195 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/7/files b/config/rootfiles/core/7/files
index a5f97474e660b6ac224374981daec5e430a98057..027880b8950fb267df057d15cf948d032cc73046 100644 (file)
--- a/config/rootfiles/core/7/files
+++ b/config/rootfiles/core/7/files
@@ -19,3 +19,4 @@ var/ipfire/graphs.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/langs
 lib/modules/2.6.16.57-ipfire/kernel/drivers/ieee1394/sbp2.ko
+html/cgi-bin/logs.cgi/log.dat

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index f443a05764e063d7f281addcd96bb29a06180ac1..40d5606b6c555ba3aadd220cb8db76bb34f6601a 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -57,6 +57,7 @@ my %sections = (
         'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
         'dns' => '(dnsmasq\[.*\]: )',
         'dhcp' => '(dhcpd: )',
+        'collectd' => '(collectd: )',
         'cron' => '(fcron\[.*\]: )',
         'ntp' => '(ntpd(?:ate)?\[.*\]: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
@@ -73,6 +74,7 @@ my %trsections = (
         'dns' => 'DNS',
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'cron' => 'Cron',
+        'collectd' => 'Collectd',
         'ntp' => 'NTP',
         'ssh' => 'SSH',
         'auth' => "$Lang::tr{'loginlogout'}",
@@ -149,7 +151,7 @@ my $date = $cgiparams{'DAY'} == 0 ? '' :  $cgiparams{'DAY'} <= 9 ? "0$cgiparams{
 
 {
     my $xday;
-    
+
     # Calculate time. If future date, calculate for past year !!!
     if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
         ( $cgiparams{'MONTH'}  > $now[4] ) ) {
@@ -169,7 +171,7 @@ my $date = $cgiparams{'DAY'} == 0 ? '' :  $cgiparams{'DAY'} <= 9 ? "0$cgiparams{
     # Convert delta in second to full weeks
        $gzindex = int (($sunday-$xday)/604800 );
 }
-                                                                                          
+
 my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
 my $daystr =  $cgiparams{'DAY'} == 0 ?  '..' : $cgiparams{'DAY'} <= 9 ? " $cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
 my $section = $sections{$cgiparams{'SECTION'}};
@@ -181,7 +183,7 @@ my $loop = 1;
 my $filestr = 0;
 my $lastdatetime;           # for debug
 my $search_for_end = 0;
-           
+
 while ($gzindex >=0 && $loop) {
         # calculate file name
         if ($gzindex == 0) {
@@ -302,7 +304,7 @@ print <<END
 END
 ;
 print "<option value='0'>$Lang::tr{'all'}</option>\n";
-for (my $day = 1; $day <= 31; $day++) 
+for (my $day = 1; $day <= 31; $day++)
 {
        print "\t<option ";
        if ($day == $cgiparams{'DAY'}) {
@@ -337,7 +339,7 @@ my $prev;
        $prev = $start - ${Header::viewsize};
        $prev = 0 if ( $prev < 0);
     }
-                                   
+
 my $next;
     if ($start == $lines - ${Header::viewsize}) {
         $next = -1;

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index db72e8455f3d4e1c1d1d9bec4fa8b15ffb4adba9..9f23e4948532e7ff4eb8a8022691bb0d7d5f8216 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -10,20 +10,27 @@ case "$1" in
                boot_mesg "Starting Collection daemon..."
                /usr/sbin/collectd -C /etc/collectd.conf
                evaluate_retval
+#
+# These lines are for furhter implementation of the collectd, atm the temps are
+# collected by the makegraphs script because of the standby functions
+#
 #              for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do boot_mesg "Bringing up hddtemp daemon for $disk ..."; /usr/sbin/hddtemp $disk -d -l localhost; evaluate_retval; done
+#
+# Starting the mbmon in deamon mode to enable sensors reading for collectd
+# later mbmon will be replaced by lmsensors, if mbmon is not running on your
+# system, we advise to comment out these lines in order to prevent fail
+#
                boot_mesg "Bringing up mbmon daemon..."
                /usr/bin/mbmon -P 411 -r
-               if [ ${?} = 0 ]; then
-                   echo_ok;
-               fi
+               evaluate_retval
                ;;
 
        stop)
-#              boot_mesg "Stopping mbmon daemon..."
-#              killproc /usr/bin/mbmon
-#              if [ ${?} = 0 ]; then
-#                  echo_ok;
-#              fi
+# if mbmon is not running on your system, we advise to comment out these lines
+# in order to prevent fail
+               boot_mesg "Stopping mbmon daemon..."
+               killproc /usr/bin/mbmon
+               evaluate_retval
 #              boot_mesg "Stopping hddtemp daemon..."
 #              killproc /usr/sbin/hddtemp
 #              evaluate_retval
@@ -33,9 +40,17 @@ case "$1" in
                ;;
 
        restart)
-               $0 stop
+
+#
+# We need to do this that way because mbmon doesn`t clear the port when killed
+# so the next startup it fails with port allready in use -> don´t restart mbmon
+#
+               boot_mesg "Stopping Collection daemon..."
+               killproc /usr/sbin/collectd
+               evaluate_retval
                sleep 1
-               $0 start
+               boot_mesg "Starting Collection daemon..."
+               /usr/sbin/collectd -C /etc/collectd.conf
                evaluate_retval
                                ;;