[NeoStats-Devel] [Commits] r2755 - trunk/modules/statserv

Author: Mark
Date: Sat Aug 20 07:17:36 2005
New Revision: 2755

Modified:
   trunk/modules/statserv/channel.c
   trunk/modules/statserv/channel.h
   trunk/modules/statserv/statserv.c
   trunk/modules/statserv/statserv.h
Log:
StatServ: more tidy ups

Modified: trunk/modules/statserv/channel.c
==============================================================================
--- trunk/modules/statserv/channel.c	(original)
+++ trunk/modules/statserv/channel.c	Sat Aug 20 07:17:36 2005
@@ -419,7 +419,7 @@
 {
 	CmdParams *cmdparams = ( CmdParams * ) v;
 
-	irc_prefmsg( ss_bot,cmdparams->source, "Channel %s Members %d", 
+	irc_prefmsg( ss_bot, cmdparams->source, "Channel %s Members %d", 
 		cs->name, cs->c->users );
 }
 
@@ -564,6 +564,30 @@
 {
 	channelstat *cs;
 	lnode_t *cn;
+
+	cn = list_first( channelstatlist );
+	while( cn )
+	{
+		cs = lnode_get( cn );
+		SaveChannel( cs );
+		cn = list_next( channelstatlist, cn );
+	}
+}
+
+/** @brief SaveChanStatsProgressive
+ *
+ *  Save channel stats progressively
+ *  Do we still need this functionality?
+ *
+ *  @param none
+ *
+ *  @return none
+ */
+
+void SaveChanStatsProgressive( void )
+{
+	channelstat *cs;
+	lnode_t *cn;
 	int limit;
     int count = 0;
 
@@ -574,7 +598,7 @@
 	{
 		cs = lnode_get( cn );
 		/* we are not shutting down, so do progressive save if we have more than 100 channels */
-		if( StatServ.shutdown == 0 && ( limit > 25 ) )
+		if( limit > 25 )
 		{
 			if( count > limit )
 				break;

Modified: trunk/modules/statserv/channel.h
==============================================================================
--- trunk/modules/statserv/channel.h	(original)
+++ trunk/modules/statserv/channel.h	Sat Aug 20 07:17:36 2005
@@ -64,6 +64,7 @@
 int InitChannelStats( void );
 void FiniChannelStats( void );
 void SaveChanStats( void );
+void SaveChanStatsProgressive( void );
 void ResetChannelStatistics( void );
 void AverageChannelStatistics( void );
 

Modified: trunk/modules/statserv/statserv.c
==============================================================================
--- trunk/modules/statserv/statserv.c	(original)
+++ trunk/modules/statserv/statserv.c	Sat Aug 20 07:17:36 2005
@@ -149,7 +149,7 @@
 {
 	SET_SEGV_LOCATION();
 	SaveServerStats();
-	SaveChanStats();
+	SaveChanStatsProgressive();
 	SaveNetworkStats();
 	return NS_SUCCESS;
 }
@@ -166,7 +166,6 @@
 int ModInit( void )
 {
 	SET_SEGV_LOCATION();
-	StatServ.shutdown = 0;
 	ModuleConfig( ss_settings );
 	if( StatServ.html && StatServ.htmlpath[0] == 0 )
 	{
@@ -235,7 +234,6 @@
 
 int ModFini( void )
 {
-	StatServ.shutdown = 1;
 	FiniServerStats();
 	FiniChannelStats();
 	FiniTLDStatistics();

Modified: trunk/modules/statserv/statserv.h
==============================================================================
--- trunk/modules/statserv/statserv.h	(original)
+++ trunk/modules/statserv/statserv.h	Sat Aug 20 07:17:36 2005
@@ -46,7 +46,6 @@
 	int channeltime;
 	int msginterval; 
 	int msglimit; 
-	int shutdown; 
 	int exclusions; 
 	int flatmap; 
 } StatServ;