Merge pull request lucasjones#5 from sammy007/master

wolf9466 · wolf9466 · commit 8393e03089c0 · 2016-03-16T08:33:44.000-05:00
Increase timeout to 600 for upcoming fork
diff --git a/cpu-miner.c b/cpu-miner.c
@@ -1406,7 +1406,7 @@ static void *stratum_thread(void *userdata) {
             }
         }
 
-        if (!stratum_socket_full(&stratum, 300)) {
+        if (!stratum_socket_full(&stratum, 600)) {
             applog(LOG_ERR, "Stratum connection timed out");
             s = NULL;
         } else

Original file line number	Diff line number	Diff line change
`@@ -1406,7 +1406,7 @@ static void stratum_thread(void userdata) {`
`1406`	`1406`	`}`
`1407`	`1407`	`}`
`1408`	`1408`
`1409`		`- if (!stratum_socket_full(&stratum, 300)) {`
	`1409`	`+ if (!stratum_socket_full(&stratum, 600)) {`
`1410`	`1410`	`applog(LOG_ERR, "Stratum connection timed out");`
`1411`	`1411`	`s = NULL;`
`1412`	`1412`	`} else`