Changeset 1572 in ntrip for trunk

Timestamp:

Feb 11, 2009, 12:48:55 AM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• latencychecker.cpp (modified) (4 diffs)
• latencychecker.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -321 +321 @@
 
       if (tryReconnect() != success) {
+        _latencyChecker->checkReconnect();
         continue;
       }
@@ -351 +352 @@
       // ------------------
       if (nBytes == 0) {
-        _latencyChecker->checkReconnect();
         emit(newMessage(_staID + ": Data timeout, reconnecting", true));
         continue;

trunk/BNC/latencychecker.cpp

@@ -151 +151 @@
   _decodeSucc = QDateTime::currentDateTime();
 
+  _decodeStop = QDateTime::currentDateTime();
+
 }
 
@@ -161 +163 @@
 //////////////////////////////////////////////////////////////////////////////
 void latencyChecker::checkReconnect() {
-  _reConnect = true;
+
+  // Begin outage threshold
+  // ----------------------
+  if ( _decodeStop.isValid() ) {
+    if ( _decodeStop.secsTo(QDateTime::currentDateTime()) >  _adviseFail * 60 ) {
+      _decodeStop.setDate(QDate());
+      _decodeStop.setTime(QTime());
+      _begDateOut = _checkTime.toUTC().date().toString("yy-MM-dd");
+      _begTimeOut = _checkTime.toUTC().time().toString("hh:mm:ss");
+      emit(newMessage((_staID
+                    + ": Failure threshold exceeded, outage since "
+                    + _begDateOut + " " + _begTimeOut).toAscii(), true));
+      callScript(("Begin_Outage "
+                    + _begDateOut + " " + _begTimeOut).toAscii());
+    }
+    _decodeStart = QDateTime::currentDateTime();
+  }
+
 }
 
@@ -257 +276 @@
   }
 
-  // Begin outage threshold
-  // ----------------------
-  if ( _decodeStop.isValid() ) {
-    if ( _decodeStop.secsTo(QDateTime::currentDateTime()) >  _adviseFail * 60 ) {
-      _decodeStop.setDate(QDate());
-      _decodeStop.setTime(QTime());
-      _begDateOut = _checkTime.toUTC().date().toString("yy-MM-dd");
-      _begTimeOut = _checkTime.toUTC().time().toString("hh:mm:ss");
-      emit(newMessage((_staID
-                    + ": Failure threshold exceeded, outage since "
-                    + _begDateOut + " " + _begTimeOut).toAscii(), true));
-      callScript(("Begin_Outage "
-                    + _begDateOut + " " + _begTimeOut).toAscii());
-      _decodeStart = QDateTime::currentDateTime();
-    }
-  }
-
   // End outage threshold
   // --------------------
@@ -292 +294 @@
                     + _endDateOut + " " + _endTimeOut + " Begin was "
                     + _begDateOut + " " + _begTimeOut).toAscii());
-      _decodeStop = QDateTime::currentDateTime();
-    }
-  }
-  _reConnect = false;
-
+    _decodeStop = QDateTime::currentDateTime();
+    }
+  }
 }
 

trunk/BNC/latencychecker.h

@@ -65 +65 @@
   bool       _endCorrupt;
   bool       _followSec;
-  bool       _reConnect;
   double     _maxDt;
   double     _sumLat;