Deal with offline checkins better

salopensource · Jun 10, 2019 · f0babe6 · f0babe6
1 parent f0fe26d
commit f0babe6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/payload/usr/local/munki/postflight.d/sal-postflight b/payload/usr/local/munki/postflight.d/sal-postflight
@@ -52,14 +52,17 @@ def check_server_connection():
     return True
 
 def check_server_online():
+    # is the offline report pref true?
+    if not utils.pref('SendOfflineReport'):
+        return
     # read report
     report = utils.get_managed_install_report()
     # check for errors and warnings
     if not check_for_errors(report):
         utils.set_pref('LastRunWasOffline', False)
         return
     # if they're there check is server is really offline
-    if not check_server_connection():
+    if check_server_connection():
         utils.set_pref('LastRunWasOffline', True)
         return
 

diff --git a/payload/usr/local/sal/bin/sal-submit b/payload/usr/local/sal/bin/sal-submit
@@ -34,7 +34,7 @@ import yaml
 
 
 BUNDLE_ID = 'com.github.salopensource.sal'
-VERSION = '2.1.4'
+VERSION = '2.1.5'
 
 # To resolve unicode write errors set our default encoding to utf8
 reload(sys)

diff --git a/payload/usr/local/sal/utils.py b/payload/usr/local/sal/utils.py
@@ -66,6 +66,7 @@ def pref(pref_name):
         'GetGrains': False,
         'GetOhai': False,
         'LastRunWasOffline': False,
+        'SendOfflineReport': False,
     }
 
     pref_value = CFPreferencesCopyAppValue(pref_name, BUNDLE_ID)
@@ -138,6 +139,7 @@ def pythonScriptRunning(scriptname):
             time.sleep(1)
             counter = counter + 1
 
+
 def check_script_running(scriptname):
     """
     Returns Process ID for a running python script.