Don't create log files on startup (<rdar://problem/28332470>)

diff --git a/CHANGES.txt b/CHANGES.txt
index 66b71edccca073a1425c15a3bfdc8dad816a1ce6..9bec2fe4ad1bd05f0562457c21761a1a34c0727a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES IN CUPS V2.2.2
         - Fixed builds on systems without a working poll() implementation
           (Issue #4905)
         - Added a USB quirk rule for the Kyocera Ecosys P6026cdn (Issue #4900)
+        - The scheduler no longer creates log files on startup
+          (<rdar://problem/28332470>)
         - Updated documentation (PR #4896)
         - Updated localizations (PR #4894, PR #4895, PR #4904, PR #4908)
 

diff --git a/scheduler/conf.c b/scheduler/conf.c
index ab271087ab39fb0a360d95f986f5a28841b5af47..0bb2b95d6cb8fc6893c965600f406c0a5025b713 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1002,19 +1002,6 @@ cupsdReadConfiguration(void)
     openlog("cupsd", LOG_PID | LOG_NOWAIT | LOG_NDELAY, LOG_LPR);
 #endif /* HAVE_VSYSLOG && !HAVE_ASL_H && !HAVE_SYSTEMD_SD_JOURNAL_H */
 
- /*
-  * Make sure each of the log files exists and gets rotated as necessary...
-  */
-
-  if (strcmp(AccessLog, "syslog"))
-    cupsdCheckLogFile(&AccessFile, AccessLog);
-
-  if (strcmp(ErrorLog, "syslog"))
-    cupsdCheckLogFile(&ErrorFile, ErrorLog);
-
-  if (strcmp(PageLog, "syslog"))
-    cupsdCheckLogFile(&PageFile, PageLog);
-
  /*
   * Log the configuration file that was used...
   */

diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 60d6f14ed8855a9a73cdb56659f294090f791a82..dcff0d52c65e96af3fd7d1735827ba7cd8b2dc71 100644 (file)
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -11051,7 +11051,7 @@
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -11094,7 +11094,7 @@
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_STRICT_OBJC_MSGSEND = YES;