Merge lp:~bregma/geis/lp-997630 into lp:geis

[Stephen M. Webb]

Integrates patch suggested by Bradley M. Froehle to avoid waiting for a timeout on complete initialization failure.

Should fix the parts of lp:997630 not already fixed.

[Chase Douglas (chasedouglas)]

Looks good to me. I'm going to apply this manually and switch the author to Bradley so he gets the glory due to him :).

review: Approve

[Daniel d'Andrada (dandrader)]

I bet there could be a test for this, if you mock here and there.

[Stephen M. Webb (bregma)]

There's already a test for it, but it needs to have some kind of timer added to indicate if it fails in less than some arbitrary and perceptible time.

=== modified file 'libgeis/geis.c'
--- libgeis/geis.c	2012-07-24 16:04:12 +0000
+++ libgeis/geis.c	2012-08-06 23:41:19 +0000
@@ -63,7 +63,8 @@
 typedef enum _GeisState
 {
   GEIS_STATE_INITIALIZING,
-  GEIS_STATE_RUNNING
+  GEIS_STATE_RUNNING,
+  GEIS_STATE_INIT_FAIL
 } _GeisState;
 
 
@@ -230,6 +231,7 @@
   {
     geis_error_push(NULL, GEIS_STATUS_UNKNOWN_ERROR);
     geis_error("can not create back end");
+    geis->state = GEIS_STATE_INIT_FAIL;
   }
   geis->backend_use_fallback = GEIS_FALSE;
 }
@@ -286,6 +288,10 @@
             geis->backend_pending = GEIS_FALSE;
             handled = GEIS_TRUE;
           }
+          else
+          {
+            geis->state = GEIS_STATE_INIT_FAIL;
+          }
           break;
 
 	default:
@@ -661,6 +667,7 @@
       geis_error_push(NULL, GEIS_STATUS_UNKNOWN_ERROR);
       geis_error("can not create back end");
       status = GEIS_FALSE;
+      geis->state = GEIS_STATE_INIT_FAIL;
     }
   }
 
@@ -705,6 +712,10 @@
         status = GEIS_STATUS_SUCCESS;
         break;
       }
+      else if (geis->state == GEIS_STATE_INIT_FAIL)
+      {
+        break;
+      }
     }
   }