Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3193
Change subject: Merge commit 'refs/changes/92/3192/1'
......................................................................
Merge commit 'refs/changes/92/3192/1'
Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 0 insertions(+), 24 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/93/3193/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
index b521715..f7291cb 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
@@ -18,12 +18,9 @@
*/
package org.apache.hyracks.control.common.controllers;
-<<<<<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
import static org.apache.hyracks.control.common.config.OptionTypes.BOOLEAN;
-=======
import java.io.File;
->>>>>>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
import java.io.Serializable;
import java.net.URL;
import java.util.function.Function;
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 e781642..9e803b3 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
@@ -32,12 +32,9 @@
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.LayoutComponentBuilder;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
-<<<<<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
-=======
import java.io.File;
import java.net.URI;
->>>>>>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
public class NCLogConfigurationFactory extends ConfigurationFactory {
private NCConfig config;
@@ -57,40 +54,22 @@
ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule",
"0 0 0 * * ?"))
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size",
"50M"));
-<<<<<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
- AppenderComponentBuilder defaultRoll =
- builder.newAppender("default", "RollingFile")
- .addAttribute("fileName", FileUtil.joinPath(logDir,
"nc-" + nodeId + ".log"))
- .addAttribute("filePattern",
- FileUtil.joinPath(logDir, "nc-" + nodeId +
"-%d{MM-dd-yy-ss}.log.gz"))
- .add(defaultLayout).addComponent(triggeringPolicy);
-=======
AppenderComponentBuilder defaultRoll = builder.newAppender("default",
"RollingFile")
.addAttribute("fileName", new File(logDir, "nc-" + nodeId +
".log").getAbsolutePath())
.addAttribute("filePattern",
new File(logDir, "nc-" + nodeId +
"-%d{MM-dd-yy}.log.gz").getAbsolutePath())
.add(defaultLayout).addComponent(triggeringPolicy);
->>>>>>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
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");
-<<<<<<< HEAD (c79e2d Merge commit '6312edf' from 'stabilization-f69489' into
'mas)
- AppenderComponentBuilder accessRoll =
- builder.newAppender("access", "RollingFile")
- .addAttribute("fileName", FileUtil.joinPath(logDir,
"access-" + nodeId + ".log"))
- .addAttribute("filePattern",
- FileUtil.joinPath(logDir, "access-" + nodeId +
"-%d{MM-dd-yy-ss}.log.gz"))
- .add(accessLayout).addComponent(triggeringPolicy);
-=======
AppenderComponentBuilder accessRoll = builder.newAppender("access",
"RollingFile")
.addAttribute("fileName", new File(logDir, "access-" + nodeId
+ ".log").getAbsolutePath())
.addAttribute("filePattern",
new File(logDir, "access-" + nodeId +
"-%d{MM-dd-yy}.log.gz").getAbsolutePath())
.add(accessLayout).addComponent(triggeringPolicy);
->>>>>>> BRANCH (e7017d [NO ISSUE] DEFAULT_DIR and logdir path fixes)
builder.add(accessRoll);
builder.add(builder.newLogger("org.apache.hyracks.http.server.CLFLogger",
Level.forName("ACCESS", 550))
.add(builder.newAppenderRef("access")).addAttribute("additivity", false));
--
To view, visit https://asterix-gerrit.ics.uci.edu/3193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0aeae95d529c8540093642985c5fa9540ee03fe
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
