noffle: src/fetch.c comparison

comparison src/fetch.c @ 188:f1bacee93ca6 noffle

[svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: robustness - instead of retruning simple Passed/Failed statuses from connection functions, return an integer status instead. This allows Noffle to distinguish between a connection failure, an unrecoverable protocol error and a recoverable problem. As a concrete instance, Noffle will no longer abort the connection if a group is removed from the upstream server. Also beef up error detection a bit. * src/content.c: instead of overwriting the existing content file(s) when updating - which leaves a window where Noffle is vulnerable to failure which will leave the content file corrupted (yes, it happened to me), write a new content file and rename it over the old file only when it has been written and closed with no errors reported.

author	bears
date	Wed, 12 Sep 2001 21:33:44 +0100
parents	fed1334d766b
children	021d145e34e9

comparison

equal deleted inserted replaced

-:166008a80f03
+:f1bacee93ca6
 /*
 fetch.c
-$Id: fetch.c 300 2001-08-05 08:24:22Z bears $
+$Id: fetch.c 307 2001-09-12 20:33:44Z bears $
 */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 {
 Log_err( "Cannot read %s. Please run noffle --query groups", file );
 return FALSE;
 }
 Log_inf( "Updating groupinfo" );
-return Client_getNewgrps( &t );
+/*
+* If NEWGROUPS fails, it isn't necessarily fatal. You can do
+* a periodic noffle --query groups to refresh your group list.
+* So only return failure here if the status indicates the link
+* itself failed.
+*
+* In particular, older versions of NNTPcache have a Y2K bug that
+* stops NEWGROUPS working.
+*/
+return ( ! IS_FATAL( Client_getNewgrps( &t ) ) );
 }
 /* Databases open on entry, closed on exit. */
-static Bool
+static int
 fetchNewArts( const char *name, FetchMode mode )
 {
-int next, first, last, refetch;
+int next, first, last, refetch, stat;
-if ( ! Client_changeToGrp( name ) )
+stat = Client_changeToGrp( name );
+if ( stat != STAT_OK )
 {
 Log_err( "Could not change to group %s", name );
 	if ( Lock_gotLock() )
 	    Lock_closeDatabases();
-return TRUE;
+return stat;
 }
 Client_rmtFirstLast( &first, &last );
 Cont_read( name );
 next = Grp_rmtNext( name );
 if ( next == GRP_RMT_NEXT_NOT_SUBSCRIBED )
 {
 Log_inf( "No new articles in %s", name );
 Cont_write();
 Grp_setFirstLast( name, Cont_first(), Cont_last() );
 	Lock_closeDatabases();
-return TRUE;
+return STAT_OK;
 }
 if ( first == 0 && last == 0 )
 {
 Log_inf( "No articles in %s", name );
 Cont_write();
 Grp_setFirstLast( name, Cont_first(), Cont_last() );
 	Lock_closeDatabases();
-return TRUE;
+return STAT_OK;
 }
 if ( next > last + 1 )
 {
 	refetch = last - Cfg_maxFetch() + 1;
 	if ( refetch < 0 ) refetch = 1;
-Log_err( "Article number inconsistent (%s rmt=%lu-%lu, next=%lu). Refetching from %lu",
+Log_err( "Article number inconsistent (%s rmt=%lu-%lu, next=%lu). "
+		 "Refetching from %lu",
 name, first, last, next, refetch );
 Pseudo_cntInconsistent( name, first, last, next, refetch );
 first = refetch;
 }
 else if ( next < first )
 {
 Log_inf( "Missing articles (%s first=%lu next=%lu)",
 name, first, next );
 Pseudo_missArts( name, first, next );
+	/*
+	 * If we are missing articles but there are none to fetch,
+	 * we must ensure we don't repeatedly generate missing
+	 * article warning on every fetch until there is something
+	 * to fetch. To guard against this, update the group remote
+	 * next now.
+	 */
+	Grp_setRmtNext( name, first );
+	next = first;
 }
 else
 first = next;
 if ( last - first > Cfg_maxFetch() )
 {
 for ( i = 0; i < size; ++i )
 {
 Fetchlist_element( &name, &mode, i );
 if ( strcmp( Grp_server( name ), fetch.serv ) == 0 )
 	{
-if ( ! fetchNewArts( name, mode ) )
+if ( IS_FATAL( fetchNewArts( name, mode ) ) )
 		return FALSE;
 	    if ( ! Lock_openDatabases() )
 	    {
 		Log_err( "Could not open message base" );
 		return FALSE;
 }
 Lock_closeDatabases();
 return TRUE;
 }
-static Bool
+static int
 fetchMessageList( const char *list, int *artcnt, int artmax )
 {
 const char *p;
 Str msgId;
+int stat;
 ASSERT( Lock_gotLock() );
-if ( ! Client_retrieveArtList( list, artcnt, artmax ) )
+stat = Client_retrieveArtList( list, artcnt, artmax );
-	return FALSE;
+if ( stat != STAT_OK )
+	return stat;
 p = list;
 while ( ( p = Utl_getLn( msgId, p ) ) )
 Req_remove( fetch.serv, msgId );
-return TRUE;
+return STAT_OK;
 }
 Bool
 Fetch_getReq_( void )
 {
 DynStr *list;
 DynStr *fetchList;
 const char *p;
 int count = 0, artcnt = 0, artmax = 0;
 Bool res;
+int stat;
 ASSERT( fetch.ready );
 Log_dbg( LOG_DBG_FETCH, "Retrieving articles marked for download" );
 list = new_DynStr( 10000 );
 fetchList = new_DynStr( 1000 );
 while ( res && ( p = Utl_getLn( msgId, p ) ) != NULL )
 {
 	DynStr_appLn( fetchList, msgId );
 	if ( ++count % MAX_ARTICLE_CMDS_QUEUED == 0 )
 	{
-	    res = fetchMessageList( DynStr_str( fetchList ), &artcnt, artmax );
+	    stat = fetchMessageList( DynStr_str( fetchList ), &artcnt,
+				     artmax );
+	    res = ! IS_FATAL( stat );
 	    DynStr_clear( fetchList );
 	}
 }
-res = res && fetchMessageList( DynStr_str( fetchList ), &artcnt, artmax );
+stat = fetchMessageList( DynStr_str( fetchList ), &artcnt, artmax );
+res = res && ! IS_FATAL( stat );
 del_DynStr( fetchList );
 del_DynStr( list );
 Lock_closeDatabases();
 return res;
 {
 Log_inf( "Posting articles" );
 do
 {
 txt = DynStr_str( s );
-	    if ( ! Client_postArt( msgId, txt, errStr ) )
+	    if ( Client_postArt( msgId, txt, errStr ) != STAT_OK )
 	    {
 		res = FALSE;
 		break;
 	    }

Mercurial > noffle

comparison src/fetch.c @ 188:f1bacee93ca6 noffle