dianping/camel
1
1
Fork 0
mirror of https://github.com/dianping/camel.git synced 2024-09-20 06:56:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a few bugs

Browse source
This commit is contained in:
leon.li 2016-08-31 12:35:37 +08:00
parent f283584728
commit 05de76aa2e
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
camel-agent/src/main/java/com/dianping/platform/slb/agent/conf/ConfigureManager.java
View file

@ -20,8 +20,6 @@ public class ConfigureManager {
private static final String PATH_NGINX_CONF_DIR = "/usr/local/nginx/conf/phoenix-slb";
public static final String PROPERTY_TRANSACTIONMANAGER = "transaction_manager";
static {
File scriptDir = getNginxReloadScriptFile().getParentFile();
Iterator<File> scriptIter = FileUtils.iterateFiles(scriptDir, new String[] { "sh" }, true);

2
camel-agent/src/main/java/com/dianping/platform/slb/agent/task/processor/config/UpgradeTransactionProcessor.java
View file

@ -1,6 +1,5 @@
package com.dianping.platform.slb.agent.task.processor.config;
import com.dianping.platform.slb.agent.conf.ConfigureManager;
import com.dianping.platform.slb.agent.task.processor.AbstractTransactionProcessor;
import com.dianping.platform.slb.agent.task.workflow.engine.Engine;
import com.dianping.platform.slb.agent.task.workflow.step.ConfigUpgradeStep;
@ -26,7 +25,6 @@ public class UpgradeTransactionProcessor extends AbstractTransactionProcessor {
@Override
protected Transaction.Status doTransaction(Transaction transaction) {
transaction.addProperty(ConfigureManager.PROPERTY_TRANSACTIONMANAGER, m_transactionManager);
int exitCode = Step.CODE_FAIL;
try {