fixes

[inn-innduct.git] / backends / innduct.c

diff --git a/backends/innduct.c b/backends/innduct.c
index f28db2edfc6330259bbfe25225186f32b12c7dc9..5997b579f603ea8fae325bbc91d1e630a46e189b 100644 (file)
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1,18 +1,10 @@
 /*
- * bugs
- *
-
- [740] <sit> info: processed feedfile(null) read=4(+0bl,+6err) offered=5(ch5,nc0) accepted=0(ch0+nc0) unwanted=0(0id+0bd+0nc) rejected=0(0id+0bd+0nc) deferred=0(0id+0bd+0nc) missing=2(0id+2bd+0nc) connretry=0(0id+0bd+0nc)
-
-   also unwanted should be nonzero I think
-
- [740] <sit> warning: corrupted file: /home/ian/things/Innfeed/inn2-2.4.5/fee, offset 349: line partially blanked: in `                                                  @050000002D130000006A0000000000000000@ <mi'..
-
-
-
+ * warning if no inotify
+ * inotify not working ?
  * some per-conn info thing for control
 
  * todo
+ 
  *  - actually do something with readable on control master
  *  - option for realsockdir
  *  - option for filepoll
@@ -1533,8 +1525,6 @@ static void conn_make_some_xmits(Conn *conn) {
        (abort(),-1);
 
       if (!artdata) art->missing= 1;
-fprintf(stderr,"INC %d %d?%d:%d\n",(int)art->state,
-       !!artdata, (int)RC_sent, (int)RC_missing);
       art->ipf->counts[art->state][ artdata ? RC_sent : RC_missing ]++;
 
       if (conn->stream) {
@@ -1569,7 +1559,6 @@ fprintf(stderr,"INC %d %d?%d:%d\n",(int)art->state,
       XMIT_LITERAL("\r\n");
 
       assert(art->state == art_Unchecked);
-fprintf(stderr,"INC %d %d\n",(int)art->state,(int)RC_sent);
       art->ipf->counts[art->state][RC_sent]++;
       LIST_ADDTAIL(conn->sent, art);
     }
@@ -1667,7 +1656,6 @@ static void update_nocheck(int accepted) {
 }
 
 static void article_done(Conn *conn, Article *art, int whichcount) {
-fprintf(stderr,"INC %d %d\n",(int)art->state,whichcount);
   if (!art->missing) art->ipf->counts[art->state][whichcount]++;
 
   if (whichcount == RC_accepted) update_nocheck(1);
@@ -1778,7 +1766,6 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
   case 335: /* IHAVE says send it */
     GET_ARTICLE(-1);
     assert(art->state == art_Unchecked);
-fprintf(stderr,"INC %d %d\n",(int)art->state,(int)RC_accepted);
     art->ipf->counts[art->state][RC_accepted]++;
     art->state= art_Wanted;
     LIST_ADDTAIL(conn->priority, art);
@@ -1926,7 +1913,7 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd,
   art->midlen= midlen;
   art->ipf= ipf;  ipf->inprogress++;
   art->token= TextToToken(tokentextbuf);
-  art->offset= ipf->offset;
+  art->offset= old_offset;
   art->blanklen= recsz;
   strcpy(art->messageid, space+1);
   LIST_ADDTAIL(queue, art);