Procházet zdrojové kódy

Merge branch 'master' of http://unque781.synology.me:3000/GSI/OHV

# Conflicts:
#	Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/FormMain.cs
unque781 před 6 roky
rodič
revize
995f6b8eb1

binární
Dev/OHVDriveLogger/OHVDriveLogger/.vs/OHVDriveLogger/v16/Server/sqlite3/storage.ide-wal


+ 8 - 2
Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/ZmqManager.cs

@@ -228,11 +228,11 @@ namespace OHVDriveLogger
             }
         }
 
-        bool Request( string topic, out string response )
+        public bool Request( string topic, out string response )
         {
             response = string.Empty;
 
-            if ( this.IsReqConnected )
+            if ( !this.IsReqConnected )
                 return false;
 
             if ( this.req.HasOut )
@@ -241,7 +241,13 @@ namespace OHVDriveLogger
             if ( this.req.TryReceiveFrameString( TimeSpan.FromSeconds( 5 ), out response ) )
                 return true;
             else
+            {
+                this.req.Disconnect( "tcp://127.0.0.1:5567" );
+
+                //this.req = new RequestSocket();
+                this.req.Connect( "tcp://127.0.0.1:5567" );
                 return false;
+            }
         }
     }
 }