SantaGUI: Log to syslog

google · Apr 11, 2016 · 488b28b · 488b28b
1 parent 0fceb7b
commit 488b28b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Conf/com.google.santad.plist b/Conf/com.google.santad.plist
@@ -7,6 +7,7 @@
 				<key>ProgramArguments</key>
 				<array>
 					<string>/Library/Extensions/santa-driver.kext/Contents/MacOS/santad</string>
+					<string>--syslog</string>
 				</array>
 				<key>MachServices</key>
 				<dict>

diff --git a/Conf/com.google.santagui.plist b/Conf/com.google.santagui.plist
@@ -7,6 +7,7 @@
 				<key>ProgramArguments</key>
 				<array>
 					<string>/Applications/Santa.app/Contents/MacOS/Santa</string>
+					<string>--syslog</string>
 				</array>
 				<key>RunAtLoad</key>
 				<true/>

diff --git a/Source/SantaGUI/SNTNotificationManager.m b/Source/SantaGUI/SNTNotificationManager.m
@@ -14,6 +14,7 @@
 
 #import "SNTNotificationManager.h"
 
+#import "SNTLogging.h"
 #import "SNTStoredEvent.h"
 
 @interface SNTNotificationManager ()
@@ -75,19 +76,19 @@ - (void)postBlockNotification:(SNTStoredEvent *)event withCustomMessage:(NSStrin
   if ([silenceDate isKindOfClass:[NSDate class]]) {
     NSDate *oneDayAgo = [NSDate dateWithTimeIntervalSinceNow:-86400];
     if ([silenceDate compare:[NSDate date]] == NSOrderedDescending) {
-      NSLog(@"Notification silence: date is in the future, ignoring");
+      LOGI(@"Notification silence: date is in the future, ignoring");
       [self updateSilenceDate:nil forHash:event.fileSHA256];
     } else if ([silenceDate compare:oneDayAgo] == NSOrderedAscending) {
-      NSLog(@"Notification silence: date is more than one day ago, ignoring");
+      LOGI(@"Notification silence: date is more than one day ago, ignoring");
       [self updateSilenceDate:nil forHash:event.fileSHA256];
     } else {
-      NSLog(@"Notification silence: dropping notification for %@", event.fileSHA256);
+      LOGI(@"Notification silence: dropping notification for %@", event.fileSHA256);
       return;
     }
   }
 
   if (!event) {
-    NSLog(@"Error: Missing event object in message received from daemon!");
+    LOGI(@"Error: Missing event object in message received from daemon!");
     return;
   }
 

diff --git a/Source/common/SNTLogging.m b/Source/common/SNTLogging.m
@@ -42,8 +42,7 @@ void logMessage(LogLevel level, FILE *destination, NSString *format, ...) {
     }
 
     // If requested, redirect output to syslog.
-    if ([[[NSProcessInfo processInfo] arguments] containsObject:@"--syslog"] ||
-        strncmp(binaryName, "santad", 6) == 0) {
+    if ([[[NSProcessInfo processInfo] arguments] containsObject:@"--syslog"]) {
       useSyslog = YES;
       pthread_key_create(&syslogKey, syslogClientDestructor);
     }