Fix race condition in worker

aanand · aanand · commit c57e9c315a76 · 2016-06-18T14:16:49.000-07:00
diff --git a/worker/src/Worker/Program.cs b/worker/src/Worker/Program.cs
@@ -40,17 +40,25 @@ public static int Main(string[] args)
 
         private static NpgsqlConnection OpenDbConnection(string connectionString)
         {
-            var connection = new NpgsqlConnection(connectionString);
+            NpgsqlConnection connection;
+
             while (true)
             {
                 try
                 {
+                    connection = new NpgsqlConnection(connectionString);
                     connection.Open();
                     break;
                 }
+                catch (SocketException)
+                {
+                    Console.Error.WriteLine("Failed to connect to db - retrying");
+                    Thread.Sleep(1000);
+                }
                 catch (DbException)
                 {
                     Console.Error.WriteLine("Failed to connect to db - retrying");
+                    Thread.Sleep(1000);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -40,17 +40,25 @@ public static int Main(string[] args)`
`40`	`40`
`41`	`41`	`private static NpgsqlConnection OpenDbConnection(string connectionString)`
`42`	`42`	`{`
`43`		`- var connection = new NpgsqlConnection(connectionString);`
	`43`	`+ NpgsqlConnection connection;`
	`44`	`+`
`44`	`45`	`while (true)`
`45`	`46`	`{`
`46`	`47`	`try`
`47`	`48`	`{`
	`49`	`+ connection = new NpgsqlConnection(connectionString);`
`48`	`50`	`connection.Open();`
`49`	`51`	`break;`
`50`	`52`	`}`
	`53`	`+ catch (SocketException)`
	`54`	`+ {`
	`55`	`+ Console.Error.WriteLine("Failed to connect to db - retrying");`
	`56`	`+ Thread.Sleep(1000);`
	`57`	`+ }`
`51`	`58`	`catch (DbException)`
`52`	`59`	`{`
`53`	`60`	`Console.Error.WriteLine("Failed to connect to db - retrying");`
	`61`	`+ Thread.Sleep(1000);`
`54`	`62`	`}`
`55`	`63`	`}`
`56`	`64`