backupiso: Update to ISO file naming - bug#12932

[people/pmueller/ipfire-2.x.git] / src / scripts / qosd

diff --git a/src/scripts/qosd b/src/scripts/qosd
index 23e6678cf7c842943590803dea05d135b42245d3..64a341322e50e4f5611b1a138f4931f104b4711f 100644 (file)
--- a/src/scripts/qosd
+++ b/src/scripts/qosd
@@ -1,54 +1,36 @@
-#!/usr/bin/perl -w 
-use strict;
+#!/usr/bin/perl -w
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
-##########################################
-##
-## DESCRIPTION
-##
-##   The tc-graph daemon script: "tc-collector"
-##   Which is part of the ADSL-optimizer.
-##
-##   The script will become a daemon and periodically collect data
-##   from the Linux traffic control system.  The collected data is
-##   stored in some RRD-data files, which is created automatically by
-##   the script if they don't exist.
-##
-## GRAPHs
-##
-##   How the RRD-data is displayed as graphs is not part of the
-##   tc-collector tool.  But we recommend using the RRD-frontend 'ddraw'.
-##   We have included some 'ddraw' examples (which is hardcoded to use
-##   files from '/var/spool/rrdqueues').
-##
-##      drraw:  http://web.taranis.org/drraw/
-##
-##
-## REQUIRES
-##
-##   RRDtools Perl interface RRDs
-##   The "tc" command.
-##
-##
-## AUTHOR
-##   Jesper Dangaard Brouer <hawk@diku.dk>, d.16/4-2004
-##
-## CHANGELOG
-##   2004-04-16:  Initial version.
-##   2004-05-27:  Daemon version.
-##
-## $Id: tc-collector.pl,v 1.12 2005/03/19 19:31:08 hawk Exp $
-##########################################
-
-# TODO:
-#  * Calc time used to parse, use to make time steps more precise
-#  * Device list support
-#  * Detecting the correct devices
+use strict;
 
 # Configuration options:
 #
 my  $device        = "$ARGV[0]";
-our $rrd_datadir   = "/var/log/rrd/";
-our $event_datadir = $rrd_datadir;
+
+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 +40,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 +86,10 @@ until ($time_to_die) {
     #if ( $res ) {
     #  print " Error updating RRDs: \"$res\"\n";
     #}
-    
-    process_events();
 
 #    my $timestamp = time;
 #    print "$timestamp\n";
-   
+
     sleep($STEP);
 }