diff options
| author | root <root@frank.tg14.gathering.org> | 2014-04-18 14:15:45 +0200 |
|---|---|---|
| committer | root <root@frank.tg14.gathering.org> | 2014-04-18 14:15:45 +0200 |
| commit | ac3714f34480fbc79c02e2abdee1e1fdcc7d2db8 (patch) | |
| tree | 5974429d323059c02abfe5058c3731ecc032f17a | |
| parent | 78af7a10e7d5edfa638e5f165130ae170ca32f5a (diff) | |
More adjustments.
| -rwxr-xr-x | clients/update-public-nms.sh | 7 | ||||
| -rwxr-xr-x | web/nms.gathering.org/nettkart-json.pl | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/clients/update-public-nms.sh b/clients/update-public-nms.sh index 535d02d..fe384cb 100755 --- a/clients/update-public-nms.sh +++ b/clients/update-public-nms.sh @@ -1,12 +1,13 @@ #!/bin/sh -DIR=/root/tgmanage/web/nms-public.gathering.org +TGMANAGE=/root/tgmanage +DIR=$TGMANAGE/web/nms-public.gathering.org -wget -qO$DIR/nettkart-trafikk.png.new http://nms.tg14.gathering.org/nettkart.pl wget -qO$DIR/nettkart-dhcp.png.new http://nms.tg14.gathering.org/dhcpkart.pl wget -qO$DIR/led.txt.new http://nms.tg14.gathering.org/led.pl -mv $DIR/nettkart-trafikk.png.new $DIR/nettkart-trafikk.png mv $DIR/nettkart-dhcp.png.new $DIR/nettkart-dhcp.png mv $DIR/led.txt.new $DIR/led.txt +/usr/bin/perl $TGMANAGE/clients/update-public-speedometer.pl > $DIR/speedometer.json.tmp +mv $DIR/speedometer.json.tmp $DIR/speedometer.json /usr/bin/perl -i -pe 'use POSIX qw(strftime); my $timestamp = strftime("%a, %d %b %Y %H:%M:%S %z", localtime(time())); s/Sist oppdatert:.*/Sist oppdatert: $timestamp/g;' $DIR/dhcp.html /usr/bin/perl -i -pe 'use POSIX qw(strftime); my $timestamp = strftime("%a, %d %b %Y %H:%M:%S %z", localtime(time())); s/Sist oppdatert:.*/Sist oppdatert: $timestamp/g;' $DIR/trafikk.html diff --git a/web/nms.gathering.org/nettkart-json.pl b/web/nms.gathering.org/nettkart-json.pl index 54ef1d2..7ffd05b 100755 --- a/web/nms.gathering.org/nettkart-json.pl +++ b/web/nms.gathering.org/nettkart-json.pl @@ -11,7 +11,14 @@ use Digest::MD5; my $cgi = CGI->new; my $secret = $cgi->param('secret'); +my $secret2 = $cgi->param('secret2'); my $noise = $cgi->param('noise') // 0; +my $fade_time = 0.0; +if (defined($secret2)) { + my $phase = $cgi->param('phase'); + my $period = $cgi->param('period'); + $fade_time = sin((time - $phase) * 2.0 * 3.14159265358 / $period) * 0.5 + 0.5; +} my $dbh = nms::db_connect(); my %json = (); @@ -36,8 +43,9 @@ while (my $ref = $q->fetchrow_hashref()) { if ($traffic >= $min) { $intensity = log($traffic / $min) / log(10); - my $fudge = oct('0x'.substr(Digest::MD5::md5_hex($cgi->{'sysname'} . $cgi->param('secret')), 0, 8)); - $intensity += $fudge * $noise; + my $fudge1 = oct('0x'.substr(Digest::MD5::md5_hex($cgi->{'sysname'} . $cgi->param('secret')), 0, 8)); + my $fudge2 = oct('0x'.substr(Digest::MD5::md5_hex($cgi->{'sysname'} . $cgi->param('secret2')), 0, 8)); + $intensity += ($fudge1 + ($fudge2 - $fudge1) * $fade_time) * $noise; $intensity = 4.0 if ($intensity > 4.0); } |