[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r17838: {torstatus} Adding countries folder and some formatting (in torstatus/trunk: . web/history)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r17838: {torstatus} Adding countries folder and some formatting (in torstatus/trunk: . web/history)
From: kasimir@xxxxxxxx
Date: Thu, 1 Jan 2009 11:21:26 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 01 Jan 2009 11:21:28 -0500
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: kasimir
Date: 2009-01-01 11:21:25 -0500 (Thu, 01 Jan 2009)
New Revision: 17838

Added:
   torstatus/trunk/web/history/countries/
Modified:
   torstatus/trunk/tns_update.pl
Log:
Adding countries folder and some formatting

Modified: torstatus/trunk/tns_update.pl
===================================================================
--- torstatus/trunk/tns_update.pl	2009-01-01 16:09:19 UTC (rev 17837)
+++ torstatus/trunk/tns_update.pl	2009-01-01 16:21:25 UTC (rev 17838)
@@ -32,7 +32,7 @@
 #  * LWP::Simple from CPAN
 #  * Date::Parse from CPAN
 #  * Geo::IP   ** Geo::IP::PurePerl should be used for those without
-#                 access to the C version of GeoIP.
+#		  access to the C version of GeoIP.
 #  * Compress::Zlib from CPAN required to decompress GeoIP files after updating
 #
 # Included Perl packages
@@ -95,13 +95,13 @@
 close ($config_handle);
 
 # Determine whether bandwidth history is enabled
-if ($config{'BandwidthHistory'} eq "true")
+if ($config{'BandwidthHistory'} eq "true" || $config{'TorHistory'} eq "true")
 {
 	use RRDs;
 }
 
 # Loop through until killed
-while (1 == 1)
+while (1)
 {
 
 # Don't die on errors
@@ -237,8 +237,8 @@
 
 # Initiate a connection to the Tor server
 my $torSocket = IO::Socket::INET->new(
-	PeerAddr 	=> $config{'LocalTorServerIP'},
-	PeerPort 	=> $config{'LocalTorServerControlPort'},
+	PeerAddr	=> $config{'LocalTorServerIP'},
+	PeerPort	=> $config{'LocalTorServerControlPort'},
 	Proto		=> "tcp",
 	Type		=> SOCK_STREAM)
 	or die "Could not connect to Tor server: $!\n";
@@ -547,8 +547,8 @@
 		# for this router
 		# A second Tor control stream will be opened
 		my $digestSocket = IO::Socket::INET->new(
-			PeerAddr 	=> $config{'LocalTorServerIP'},
-			PeerPort 	=> $config{'LocalTorServerControlPort'},
+			PeerAddr	=> $config{'LocalTorServerIP'},
+			PeerPort	=> $config{'LocalTorServerControlPort'},
 			Proto		=> "tcp",
 			Type		=> SOCK_STREAM)
 			or die "Could not connect to Tor server: $!\n";
@@ -903,12 +903,12 @@
 unless (-e $serverflagfile) {
 	my $err = RRDs::create(
 		$serverflagfile,
-		"--start=1199145600", 		# start on Jan 1, 2008
-		"--step=300", 	      		# maybe change to $config{$Cache_Expire_Time}, and heartbeat to 2times|3times expire time ???
-	        "DS:run:GAUGE:900:0:U",		# number of running servers
-		"DS:runExit:GAUGE:900:0:U", 	# number of running exits
-        	"DS:runGuard:GAUGE:900:0:U",	# number of guard nodes
-	        "DS:runFast:GAUGE:900:0:U",	# number of fast nodes
+		"--start=1199145600",		# start on Jan 1, 2008
+		"--step=300",			# maybe change to $config{$Cache_Expire_Time}, and heartbeat to 2times|3times expire time ???
+		"DS:run:GAUGE:900:0:U",		# number of running servers
+		"DS:runExit:GAUGE:900:0:U",	# number of running exits
+		"DS:runGuard:GAUGE:900:0:U",	# number of guard nodes
+		"DS:runFast:GAUGE:900:0:U",	# number of fast nodes
 		"RRA:AVERAGE:0.5:1:288",	# every 5 minutes, for 1 day
 		"RRA:AVERAGE:0.5:12:168",	# every hour, for 1 week
 		"RRA:AVERAGE:0.5:48:558",	# every 4 hours, for 93 days
@@ -921,38 +921,38 @@
 unless (-e $servernumberfile) {
 	my $err = RRDs::create(
 		$servernumberfile,
-		"--start=1199145600",          	# start on Jan 1, 2008
-		"--step=300",                   # maybe change to $config{$Cache_Expire_Time}, and heartbeat to 2times|3times expire time ???
+		"--start=1199145600",		# start on Jan 1, 2008
+		"--step=300",			# maybe change to $config{$Cache_Expire_Time}, and heartbeat to 2times|3times expire time ???
 		"DS:runUS:GAUGE:900:0:U",	# number of servers in: US
 		"DS:runExitUS:GAUGE:900:0:U",	# US - Exit
-		"DS:runDE:GAUGE:900:0:U",       # DE
-		"DS:runExitDE:GAUGE:900:0:U",   # DE - Exit
-		"DS:runCN:GAUGE:900:0:U",       # CN
-		"DS:runExitCN:GAUGE:900:0:U",   # CN - Exit
-		"DS:runFR:GAUGE:900:0:U",       # FR
-		"DS:runExitFR:GAUGE:900:0:U",   # FR - Exit
-		"DS:runSE:GAUGE:900:0:U",       # SE
-		"DS:runExitSE:GAUGE:900:0:U",   # SE - Exit
-		"DS:runRU:GAUGE:900:0:U",       # RU
-		"DS:runExitRU:GAUGE:900:0:U",   # RU - Exit
-		"DS:runNL:GAUGE:900:0:U",       # NL
-		"DS:runExitNL:GAUGE:900:0:U",   # NL - Exit
-		"DS:runCA:GAUGE:900:0:U",       # CA
-		"DS:runExitCA:GAUGE:900:0:U",   # CA - Exit
-		"DS:runGB:GAUGE:900:0:U",       # GB
-		"DS:runExitGB:GAUGE:900:0:U",   # GB - Exit
-		"DS:runIT:GAUGE:900:0:U",       # IT
-		"DS:runExitIT:GAUGE:900:0:U",   # IT - Exit
-		"DS:runAT:GAUGE:900:0:U",       # AT
-		"DS:runExitAT:GAUGE:900:0:U",   # AT - Exit
+		"DS:runDE:GAUGE:900:0:U",	# DE
+		"DS:runExitDE:GAUGE:900:0:U",	# DE - Exit
+		"DS:runCN:GAUGE:900:0:U",	# CN
+		"DS:runExitCN:GAUGE:900:0:U",	# CN - Exit
+		"DS:runFR:GAUGE:900:0:U",	# FR
+		"DS:runExitFR:GAUGE:900:0:U",	# FR - Exit
+		"DS:runSE:GAUGE:900:0:U",	# SE
+		"DS:runExitSE:GAUGE:900:0:U",	# SE - Exit
+		"DS:runRU:GAUGE:900:0:U",	# RU
+		"DS:runExitRU:GAUGE:900:0:U",	# RU - Exit
+		"DS:runNL:GAUGE:900:0:U",	# NL
+		"DS:runExitNL:GAUGE:900:0:U",	# NL - Exit
+		"DS:runCA:GAUGE:900:0:U",	# CA
+		"DS:runExitCA:GAUGE:900:0:U",	# CA - Exit
+		"DS:runGB:GAUGE:900:0:U",	# GB
+		"DS:runExitGB:GAUGE:900:0:U",	# GB - Exit
+		"DS:runIT:GAUGE:900:0:U",	# IT
+		"DS:runExitIT:GAUGE:900:0:U",	# IT - Exit
+		"DS:runAT:GAUGE:900:0:U",	# AT
+		"DS:runExitAT:GAUGE:900:0:U",	# AT - Exit
 		# ADD OTHERS HERE ...
 		"DS:runOther:GAUGE:900:0:U",		# other countries
 		"DS:runExitOther:GAUGE:900:0:U",	# other countries - Exit
-		"RRA:AVERAGE:0.5:1:288",        # every 5 minutes, for 1 day
-		"RRA:AVERAGE:0.5:12:168",       # every hour, for 1 week
-		"RRA:AVERAGE:0.5:48:558",       # every 4 hours, for 93 days
-		"RRA:AVERAGE:0.5:144:732",      # every 12 hours, for 1 year
-		"RRA:AVERAGE:0.5:576:549"       # every 48 hours, for 3 years
+		"RRA:AVERAGE:0.5:1:288",	# every 5 minutes, for 1 day
+		"RRA:AVERAGE:0.5:12:168",	# every hour, for 1 week
+		"RRA:AVERAGE:0.5:48:558",	# every 4 hours, for 93 days
+		"RRA:AVERAGE:0.5:144:732",	# every 12 hours, for 1 year
+		"RRA:AVERAGE:0.5:576:549"	# every 48 hours, for 3 years
 		);
 	print "RRDs::create error: $err\n" if $err and $err != 1;
 
@@ -1097,7 +1097,7 @@
 
 };
 if ($@) {
-	print "The TorStatus database was not updated properly.  An error has occured.  I will continue to try to update, however.\n";
+	print "The TorStatus database was not updated properly.  An error has occured.	I will continue to try to update, however.\n";
 }
 
 # Sleep for the desired time from the configuration file

Prev by Author: [or-cvs] r17837: {torstatus} Moving network history to operate with separate Tor node and (torstatus/trunk/web)
Next by Author: [or-cvs] r17844: {torstatus} (ticket:124) Adding dynamic bandwidth history graph support (in torstatus/trunk: . cgi-bin/perlgraph)
Previous by thread: [or-cvs] r17837: {torstatus} Moving network history to operate with separate Tor node and (torstatus/trunk/web)
Next by thread: [or-cvs] r17839: {website} Mainetance/polish translation update. (in website/trunk: pl press/pl)
Index(es):
- Author
- Thread