Add more full scrape stats

diff --git a/opentracker.c b/opentracker.c
index bf9db8996f534b34e3e678d874e24294872c70f2..9c3636160c7f065284eb8c765d72455c0bd7482a 100644 (file)
--- a/opentracker.c
+++ b/opentracker.c
@@ -35,6 +35,8 @@ static unsigned long long ot_overall_tcp_connections = 0;
 static unsigned long long ot_overall_udp_connections = 0;
 static unsigned long long ot_overall_tcp_successfulannounces = 0;
 static unsigned long long ot_overall_udp_successfulannounces = 0;
+static unsigned long long ot_full_scrape_count = 0;
+static unsigned long long ot_full_scrape_size = 0;
 static time_t ot_start_time;
 static const size_t SUCCESS_HTTP_HEADER_LENGTH = 80;
 static const size_t SUCCESS_HTTP_SIZE_OFF = 17;
@@ -325,6 +327,8 @@ LOG_TO_STDERR( "sync: %d.%d.%d.%d\n", h->ip[0], h->ip[1], h->ip[2], h->ip[3] );
           mode = STATS_MRTG;
         else if( !byte_diff(data,4,"top5"))
           mode = STATS_TOP5;
+        else if( !byte_diff(data,4,"fscr"))
+          mode = STATS_FULLSCRAPE;
         else if( !byte_diff(data,4,"dmem"))
           mode = STATS_DMEM;
         else if( !byte_diff(data,4,"tcp4"))
@@ -367,6 +371,14 @@ LOG_TO_STDERR( "stats: %d.%d.%d.%d - mode: dmem\n", h->ip[0], h->ip[1], h->ip[2]
           /* Enough for http header + whole scrape string */
           if( !( reply_size = return_stats_for_tracker( SUCCESS_HTTP_HEADER_LENGTH + static_outbuf, mode ) ) ) HTTPERROR_500;
           break;
+
+        case STATS_FULLSCRAPE:
+          t = time( NULL ) - ot_start_time;
+          reply_size = sprintf( static_outbuf + SUCCESS_HTTP_HEADER_LENGTH,
+                "%llu\n%llu\n%i seconds (%i hours)\nopentracker full scrape stats.",
+                ot_full_scrape_count * 1000, ot_full_scrape_size, (int)t, (int)(t / 3600) );
+          break;
+
         case STATS_SLASH24S:
 {
 LOG_TO_STDERR( "stats: %d.%d.%d.%d - mode: s24s\n", h->ip[0], h->ip[1], h->ip[2], h->ip[3] );
@@ -405,7 +417,12 @@ LOG_TO_STDERR( "[%08d] scrp: %d.%d.%d.%d - FULL SCRAPE\n", (unsigned int)(g_now
 write( 2, debug_request, l );
 #endif
       if( !( reply_size = return_fullscrape_for_tracker( &reply ) ) ) HTTPERROR_500;
+
+      /* Stat keeping */
       ot_overall_tcp_successfulannounces++;
+      ot_full_scrape_count++;
+      ot_full_scrape_size += reply_size;
+
       return sendmmapdata( s, reply, reply_size );
     }
 

diff --git a/trackerlogic.h b/trackerlogic.h
index fc6c884dd21595205f725fa66f53ce79af42f255..ccd34659878c1fccc13f40434c243c67d12ace9e 100644 (file)
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -98,7 +98,7 @@ typedef struct {
 int  init_logic( const char * const serverdir );
 void deinit_logic( void );
 
-enum { STATS_MRTG, STATS_TOP5, STATS_DMEM, STATS_TCP, STATS_UDP, STATS_SLASH24S, STATS_SLASH24S_OLD, SYNC_IN, SYNC_OUT };
+enum { STATS_MRTG, STATS_TOP5, STATS_DMEM, STATS_TCP, STATS_UDP, STATS_SLASH24S, STATS_SLASH24S_OLD, SYNC_IN, SYNC_OUT, STATS_FULLSCRAPE };
 
 #ifdef WANT_TRACKER_SYNC
 ot_torrent *add_peer_to_torrent( ot_hash *hash, ot_peer *peer, int from_changeset );