conn timeouts

Author: go-while

Config.go

@@ -132,6 +132,7 @@ type Provider struct {
 	Username      string    // username for authentication
 	Password      string    // password for authentication
 	MaxConns      int       // maximum number of connections to the provider
+	OpenConns     int       // current number of open connections
 	TCPMode       string    // TCP mode to use (tcp, tcp4, tcp6)
 	PreferIHAVE   bool      // if true, prefer IHAVE over POST method
 	MaxConnErrors int       // maximum number of errors before giving up on a connection
@@ -164,6 +165,18 @@ type Provider struct {
 	}
 } // end Provider struct
 
+func (p *Provider) IncrementOpenConns() {
+	p.mux.Lock()
+	p.OpenConns++
+	p.mux.Unlock()
+}
+
+func (p *Provider) DecrementOpenConns() {
+	p.mux.Lock()
+	p.OpenConns--
+	p.mux.Unlock()
+}
+
 type segmentChanItem struct {
 	// segmentChanItem is used to store information about a segment/article
 	// that is being processed in the segment channel.

MemLimit.go

@@ -15,6 +15,7 @@ package main
  */
 
 import (
+	"log"
 	"os"
 
 	"github.com/go-while/go-loggedrwmutex"
@@ -131,7 +132,6 @@ func (m *MemLimiter) MemReturn(who string, item *segmentChanItem) {
 		return // not memlocked, nothing to do
 	}
 	item.mux.RUnlock()
-	defer GCounter.Incr("TOTAL_MemReturned")
 
 	// remove map entry from mem
 	m.mux.Lock()
@@ -141,11 +141,11 @@ func (m *MemLimiter) MemReturn(who string, item *segmentChanItem) {
 	// return the slot
 	select {
 	case m.memchan <- struct{}{}: // return mem slot into chan
-		//pass
+		GCounter.Incr("TOTAL_MemReturned")
 	default:
 		// wtf chan is full?? that's a bug!
-		dlog(always, "ERROR on MemReturn chan is full seg.Id='%s' who='%s'", item.segment.Id, who)
-		os.Exit(1) // this is a bug! we should never return a slot to a full chan!
+		// this is a bug! we should never return a slot to a full chan!
+		log.Fatalf("ERROR on MemReturn chan is full seg.Id='%s' who='%s'", item.segment.Id, who)
 	}
 	item.mux.Lock()
 	item.memlocked--

Routines.go

@@ -447,6 +447,7 @@ func (s *SESSION) GoReupsRoutine(wid int, provider *Provider, item *segmentChanI
 		}
 		item.flaginUP = false
 		item.flagisUP = true
+		item.fails = 0
 		item.mux.Unlock()
 		// update provider statistics
 		provider.mux.Lock() // mutex #87c9 articles.refreshed++

Session.go

@@ -83,6 +83,7 @@ type SESSION struct {
 	checkFeedDone         bool              // checkDone is set to true when the segment feeder has finished feeding to channel, check may still be activly running!
 	segcheckdone          bool              // segcheckdone is set to true when the segment check is done
 	proxy                 bool              // flag to signal proxy is used in LaunchSession
+	bootedWorkers         int               // counts how many workers have been booted
 } // end type SESSION struct
 
 func (p *PROCESSOR) NewProcessor() error {