mirror of
https://github.com/dianping/camel.git
synced 2024-09-20 15:06:06 +08:00
fix a few bugs
This commit is contained in:
parent
f283584728
commit
05de76aa2e
|
@ -20,8 +20,6 @@ public class ConfigureManager {
|
||||||
|
|
||||||
private static final String PATH_NGINX_CONF_DIR = "/usr/local/nginx/conf/phoenix-slb";
|
private static final String PATH_NGINX_CONF_DIR = "/usr/local/nginx/conf/phoenix-slb";
|
||||||
|
|
||||||
public static final String PROPERTY_TRANSACTIONMANAGER = "transaction_manager";
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
File scriptDir = getNginxReloadScriptFile().getParentFile();
|
File scriptDir = getNginxReloadScriptFile().getParentFile();
|
||||||
Iterator<File> scriptIter = FileUtils.iterateFiles(scriptDir, new String[] { "sh" }, true);
|
Iterator<File> scriptIter = FileUtils.iterateFiles(scriptDir, new String[] { "sh" }, true);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package com.dianping.platform.slb.agent.task.processor.config;
|
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.processor.AbstractTransactionProcessor;
|
||||||
import com.dianping.platform.slb.agent.task.workflow.engine.Engine;
|
import com.dianping.platform.slb.agent.task.workflow.engine.Engine;
|
||||||
import com.dianping.platform.slb.agent.task.workflow.step.ConfigUpgradeStep;
|
import com.dianping.platform.slb.agent.task.workflow.step.ConfigUpgradeStep;
|
||||||
|
@ -26,7 +25,6 @@ public class UpgradeTransactionProcessor extends AbstractTransactionProcessor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Transaction.Status doTransaction(Transaction transaction) {
|
protected Transaction.Status doTransaction(Transaction transaction) {
|
||||||
transaction.addProperty(ConfigureManager.PROPERTY_TRANSACTIONMANAGER, m_transactionManager);
|
|
||||||
int exitCode = Step.CODE_FAIL;
|
int exitCode = Step.CODE_FAIL;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in a new issue