path: root/ot_stats.c
diff options
authorerdgeist <>2010-04-22 22:08:42 +0000
committererdgeist <>2010-04-22 22:08:42 +0000
commitd42bf5a0310b8df4babff645ee91c37e9f994bfe (patch)
tree878712aeae9d2c64dc626b2945f11cac50954258 /ot_stats.c
parentae9ab769415f30ccb444bb0b0190a5fcf22275e7 (diff)
** struct ot_workstruct gets ritcher (and will become even ritcher soon).
This is where we encapsulate all per-request data from peer to hash to peer_id, so that it is available everywhere without passing hundreds of pointers down the stack. Most functions that do work down the stack now accept an ot_workstruct and some flags. So it can end up in the stats/event-handler where it will be the default parameter in the future. ** peer_id is now being copied by default and moved to ot_workstruct So it is available in stats and subsequent functions. ** sync scrape madness is gone SYNC_SCRAPE was intended to sync tracker state that would normally be lost on restarts i.e. downloaded counts per torrent. The way was to push it in the tracker cloud after finding all neighbouring trackers. This is madness. It never was tested and can be done per tracker by fetching stats/mode=statedump from time to time and starting opentracker with the -l option later. ** livesync thread has its own ot_workstruct now So it can behave like ot_udp and ot_http against trackerlogic.c and get rid of the first half of the embarrassing global variables. The sending half will be fixed soon [tm]. ** stats can log completed events The author recognizes the needs of original content distributors to keep track of the amount of times a work has been downloaded. While not feasible and used on openbittorrent and other open and anonymous tracker installations, a tracker user can now choose to send those events to syslog.
Diffstat (limited to 'ot_stats.c')
1 files changed, 15 insertions, 3 deletions
diff --git a/ot_stats.c b/ot_stats.c
index 43ab8fd..b6469f9 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -642,8 +642,9 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
643#ifdef WANT_SYSLOGS 643#ifdef WANT_SYSLOGS
644 if( event_data) { 644 if( event_data) {
645 struct ot_workstruct *ws = (struct ot_workstruct *)event_data;
645 char timestring[64]; 646 char timestring[64];
646 char hex_out[42]; 647 char hash_hex[42], peerid_hex[42], ip_readable[64];
647 struct tm time_now; 648 struct tm time_now;
648 time_t ttt; 649 time_t ttt;
649 650
@@ -651,8 +652,19 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
651 localtime_r( &ttt, &time_now ); 652 localtime_r( &ttt, &time_now );
652 strftime( timestring, sizeof( timestring ), "%FT%T%z", &time_now ); 653 strftime( timestring, sizeof( timestring ), "%FT%T%z", &time_now );
653 654
654 to_hex( hex_out, (uint8_t*)event_data ); 655 to_hex( hash_hex, *ws->hash );
655 syslog( LOG_INFO, "time=%s event=completed info_hash=%s", timestring, hex_out ); 656 if( ws->peer_id )
657 to_hex( peerid_hex, (uint8_t*)ws->peer_id );
658 else {
659 *peerid_hex=0;
660 }
662#ifdef WANT_V6
663 ip_readable[ fmt_ip6c( ip_readable, (char*)&ws->peer ) ] = 0;
665 ip_readable[ fmt_ip4( ip_readable, (char*)&ws->peer ) ] = 0;
667 syslog( LOG_INFO, "time=%s event=completed info_hash=%s peer_id=%s ip=%s", timestring, hash_hex, peerid_hex, ip_readable );
656 } 668 }
657#endif 669#endif
658 ot_overall_completed++; 670 ot_overall_completed++;