You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/04/05 06:23:37 UTC

git commit: TS-2701: silence traffic_cop logging on chown of missing lock files

Repository: trafficserver
Updated Branches:
  refs/heads/master c560a936a -> edf91cad7


TS-2701: silence traffic_cop logging on chown of missing lock files


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/edf91cad
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/edf91cad
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/edf91cad

Branch: refs/heads/master
Commit: edf91cad70723f8a94f1b0277aa264238ae0a894
Parents: c560a93
Author: James Peach <jp...@apache.org>
Authored: Fri Apr 4 21:22:45 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Apr 4 21:22:45 2014 -0700

----------------------------------------------------------------------
 CHANGES                        | 2 ++
 cmd/traffic_cop/traffic_cop.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/edf91cad/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4a02168..9f9e7aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2701] Silence traffic_cop logging on chown of missing lock files.
+
   *) [TS-2656 Determine server connection scheme immediately before
    connecting. Author: Ron Barber <rw...@gmail.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/edf91cad/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 8d34b13..ee80716 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -198,7 +198,7 @@ cop_log(int priority, const char *format, ...)
 void
 chown_file_to_admin_user(const char *file) {
   if (admin_user_p) {
-    if (chown(file, admin_uid, admin_gid) < 0) {
+    if (chown(file, admin_uid, admin_gid) < 0 && errno != ENOENT) {
       cop_log(COP_FATAL, "cop couldn't chown the file: '%s' for '%s' (%d/%d) : [%d] %s\n",
               file, admin_user, admin_uid, admin_gid, errno, strerror(errno));
     }