You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2019/10/21 19:25:16 UTC
[trafficserver] branch 9.0.x updated: Removed hardcoded
logging.yaml filename in logs
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f336266 Removed hardcoded logging.yaml filename in logs
f336266 is described below
commit f336266ace49737c43e7c86f5a3fa7a63db67ba6
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue Oct 1 15:25:53 2019 -0700
Removed hardcoded logging.yaml filename in logs
(cherry picked from commit 173173fc14bbcd8b43b60727c1a2a59565b844b1)
---
proxy/logging/LogConfig.cc | 6 +++---
proxy/logging/YamlLogConfig.cc | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 5160554..41b0fcc 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -809,14 +809,14 @@ LogConfig::evaluate_config()
return false;
}
- Note("logging.yaml loading ...");
+ Note("%s loading ...", path.get());
YamlLogConfig y(this);
bool zret = y.parse(path.get());
if (zret) {
- Note("logging.yaml finished loading");
+ Note("%s finished loading", path.get());
} else {
- Note("logging.yaml failed to load");
+ Note("%s failed to load", path.get());
}
return zret;
diff --git a/proxy/logging/YamlLogConfig.cc b/proxy/logging/YamlLogConfig.cc
index ec44d1a..25cefe9 100644
--- a/proxy/logging/YamlLogConfig.cc
+++ b/proxy/logging/YamlLogConfig.cc
@@ -54,14 +54,14 @@ YamlLogConfig::loadLogConfig(const char *cfgFilename)
}
if (!config.IsMap()) {
- Error("malformed logging.yaml file; expected a map");
+ Error("malformed %s file; expected a map", cfgFilename);
return false;
}
if (config["logging"]) {
config = config["logging"];
} else {
- Error("malformed logging.yaml file; expected a toplevel 'logging' node");
+ Error("malformed %s file; expected a toplevel 'logging' node", cfgFilename);
return false;
}