X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fscripts%2Fqosd;h=21498824f44f4ead465fddd9208c4413e722c5e0;hb=0b34d1a225efdf278a72abb9d5a8eaed6bd206df;hp=2bae22ab465000aa720d5f8daa7b8afc440375f2;hpb=a7fb5630d1a1eca802d2bf714dde6a50b325a2cf;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/src/scripts/qosd b/src/scripts/qosd
index 2bae22ab46..21498824f4 100644
--- a/src/scripts/qosd
+++ b/src/scripts/qosd
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!/usr/bin/perl -w
 use strict;
 
 ##########################################
@@ -46,9 +46,14 @@ use strict;
 
 # Configuration options:
 #
-my  $device        = "imq0";
-our $rrd_datadir   = "/var/log/rrd";
-our $event_datadir = $rrd_datadir;
+my  $device        = "$ARGV[0]";
+
+our %mainsettings = ();
+require '/var/ipfire/general-functions.pl';
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+
+our $rrd_datadir   = $mainsettings{'RRDLOG'}."/";
+our $event_datadir = $mainsettings{'RRDLOG'};
 our $STEP          = 10;
 our $tc_command    = "/sbin/tc";
 
@@ -58,20 +63,20 @@ our $tc_command    = "/sbin/tc";
 my $include_dir = '/var/ipfire/qos/bin';
 
 
-# Create the $rrd_datadir if it doesn't exists
-if ( ! -d $rrd_datadir ) {
-    print "RRD-datadir not found, creating it: $rrd_datadir \n";
-    my $status = system("mkdir $rrd_datadir");
-    die "\nERROR cannot create \"$rrd_datadir\"\n" unless $status == 0;
+# Create the $mainsettings{'RRDLOG'} if it doesn't exists
+if ( ! -d $mainsettings{'RRDLOG'} ) {
+    print "RRD-datadir not found, creating it: $mainsettings{'RRDLOG'} \n";
+    my $status = system("mkdir $mainsettings{'RRDLOG'}");
+    die "\nERROR cannot create \"$mainsettings{'RRDLOG'}\"\n" unless $status == 0;
 }
 
 # use POSIX;
 #
-#POSIX::setsid() 
+#POSIX::setsid()
 #    or die "Can't become a daemon: $!";
 
 # The init scripts will do the right "daemon" thing...
-# Become a daemon  
+# Become a daemon
 print "Becoming a daemon...\n";
 my $pid = fork;
 exit if $pid;
@@ -104,12 +109,10 @@ until ($time_to_die) {
     #if ( $res ) {
     #	print " Error updating RRDs: \"$res\"\n";
     #}
-    
-    process_events();
 
 #    my $timestamp = time;
 #    print "$timestamp\n";
-   
+
     sleep($STEP);
 }