Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3194
Change subject: [NO ISSUE] Fix access log pathing
......................................................................
[NO ISSUE] Fix access log pathing
Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03ea
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 17 insertions(+), 14 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/94/3194/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
index 98e0245..f09f335 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
@@ -50,20 +50,20 @@
ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule",
"0 0 0 * * ?"))
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size",
"50M"));
- AppenderComponentBuilder defaultRoll =
- builder.newAppender("default",
"RollingFile").addAttribute("fileName", new File(logDir, "cc.log"))
- .addAttribute("filePattern", new File(logDir,
"cc-%d{MM-dd-yy}.log.gz")).add(defaultLayout)
- .addComponent(triggeringPolicy);
+ AppenderComponentBuilder defaultRoll = builder.newAppender("default",
"RollingFile")
+ .addAttribute("fileName", new File(logDir,
"cc.log").getAbsolutePath())
+ .addAttribute("filePattern", new File(logDir,
"cc-%d{MM-dd-yy}.log.gz").getAbsolutePath())
+ .add(defaultLayout).addComponent(triggeringPolicy);
builder.add(defaultRoll);
// create the new logger
builder.add(builder.newRootLogger(Level.INFO).add(builder.newAppenderRef("default")));
LayoutComponentBuilder accessLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m%n");
- AppenderComponentBuilder accessRoll =
- builder.newAppender("access",
"RollingFile").addAttribute("fileName", new File(logDir, "access.log"))
- .addAttribute("filePattern", new File(logDir,
"access-%d{MM-dd-yy}.log.gz")).add(accessLayout)
- .addComponent(triggeringPolicy);
+ AppenderComponentBuilder accessRoll = builder.newAppender("access",
"RollingFile")
+ .addAttribute("fileName", new File(logDir,
"access.log").getAbsolutePath())
+ .addAttribute("filePattern", new File(logDir,
"access-%d{MM-dd-yy}.log.gz").getAbsolutePath())
+ .add(accessLayout).addComponent(triggeringPolicy);
builder.add(accessRoll);
builder.add(builder.newLogger("org.apache.hyracks.http.server.CLFLogger",
Level.forName("ACCESS", 550))
.add(builder.newAppenderRef("access")).addAttribute("additivity", false));
@@ -71,9 +71,11 @@
LayoutComponentBuilder traceLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m,%n")
.addAttribute("header", "[").addAttribute("footer", "]");
AppenderComponentBuilder traceRoll =
- builder.newAppender("trace",
"RollingFile").addAttribute("fileName", logDir + "trace-cc.log")
- .addAttribute("filePattern", logDir +
"trace-cc-%d{MM-dd-yy-ss}.log.gz").add(traceLayout)
- .addComponent(triggeringPolicy);
+ builder.newAppender("trace", "RollingFile")
+ .addAttribute("fileName", new File(logDir,
"trace-cc.log").getAbsolutePath())
+ .addAttribute("filePattern",
+ new File(logDir,
"trace-cc-%d{MM-dd-yy-ss}.log.gz").getAbsolutePath())
+ .add(traceLayout).addComponent(triggeringPolicy);
builder.add(traceRoll);
builder.add(builder.newLogger("org.apache.hyracks.util.trace.Tracer.Traces",
Level.forName("TRACER", 570))
.add(builder.newAppenderRef("trace")).addAttribute("additivity", false));
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index 9e803b3..9dcdba2 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@ -77,9 +77,10 @@
LayoutComponentBuilder traceLayout =
builder.newLayout("PatternLayout").addAttribute("pattern", "%m,%n")
.addAttribute("header", "[").addAttribute("footer", "]");
AppenderComponentBuilder traceRoll = builder.newAppender("trace",
"RollingFile")
- .addAttribute("fileName", logDir + "trace-" + nodeId + ".log")
- .addAttribute("filePattern", logDir + "trace-" + nodeId +
"-%d{MM-dd-yy-ss}.log.gz").add(traceLayout)
- .addComponent(triggeringPolicy);
+ .addAttribute("fileName", new File(logDir, "trace-" + nodeId +
".log").getAbsolutePath())
+ .addAttribute("filePattern",
+ new File(logDir, "trace-" + nodeId +
"-%d{MM-dd-yy-ss}.log.gz").getAbsolutePath())
+ .add(traceLayout).addComponent(triggeringPolicy);
builder.add(traceRoll);
builder.add(builder.newLogger("org.apache.hyracks.util.trace.Tracer.Traces",
Level.forName("TRACER", 570))
.add(builder.newAppenderRef("trace")).addAttribute("additivity", false));
--
To view, visit https://asterix-gerrit.ics.uci.edu/3194
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03ea
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
