Outage detection.

7 years ago · e507256e52
parent c96e2bb8b4
commit e507256e52
1 changed files with 2 additions and 7 deletions
--- a/SignalServiceKit/src/Network/OutageDetection.swift
+++ b/SignalServiceKit/src/Network/OutageDetection.swift
@ -28,14 +28,9 @@ public class OutageDetection: NSObject {
            ensureCheckTimer()
        }
    }
-<<<<<<< HEAD

-||||||| merged common ancestors
-
-=======
-
-    // We want to be conversative and only
->>>>>>> Outage detection.
+    // We only show the outage warning when we're certain there's an outage.
+    // DNS lookup failures, etc. are not considered an outage.
    private func checkForOutageSync() -> Bool {
        let host = CFHostCreateWithName(nil, "uptime.signal.org" as CFString).takeRetainedValue()
        CFHostStartInfoResolution(host, .addresses, nil)