You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/11 20:46:56 UTC
[32/50] [abbrv] git commit: Removed unnecessary configuration fields
in agent.conf Added placeholder values in the agent.conf and logging.ini
Removed unnecessary configuration fields in agent.conf
Added placeholder values in the agent.conf and logging.ini
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/19f9227f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/19f9227f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/19f9227f
Branch: refs/heads/master
Commit: 19f9227f7b5905261586985c195d97f222716ca3
Parents: 8200385
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Fri Oct 10 12:55:48 2014 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Fri Oct 10 12:55:48 2014 +0530
----------------------------------------------------------------------
.../cartridge-agent/agent.conf | 25 +++++++++-----------
.../cartridge-agent/logging.ini | 2 +-
.../modules/util/cartridgeagentconstants.py | 1 -
3 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/19f9227f/tools/python-cartridge-agent/cartridge-agent/agent.conf
----------------------------------------------------------------------
diff --git a/tools/python-cartridge-agent/cartridge-agent/agent.conf b/tools/python-cartridge-agent/cartridge-agent/agent.conf
index 57e9992..cb7c686 100644
--- a/tools/python-cartridge-agent/cartridge-agent/agent.conf
+++ b/tools/python-cartridge-agent/cartridge-agent/agent.conf
@@ -18,22 +18,19 @@
[agent]
mb.ip =MB-IP
mb.port =MB-PORT
-listen.address =localhost
+listen.address =LISTEN_ADDR
thrift.receiver.ip =CEP-IP
thrift.receiver.port =CEP-PORT
-agent.root =
-param.file.path =/tmp/payload/launch-params
-extensions.dir =/extensions
-cep.stats.publisher.enabled =true
-lb.private.ip =
-lb.public.ip =
-javax.net.ssl.trustStore =CERT-TRUSTSTORE
-javax.net.ssl.trustStorePassword =TRUSTSTORE-PASSWORD
-enable.artifact.update =true
-auto.commit =false
-auto.checkout =true
-artifact.update.interval =15
-port.check.timeout =600
+param.file.path =/mnt/cartridge-agent/payload/launch-params
+extensions.dir =/mnt/cartridge-agent/extensions
+cep.stats.publisher.enabled =ENABLE_HEALTH_PUBLISHER
+lb.private.ip =LB_PRIVATE_IP
+lb.public.ip =LB_PUBLIC_IP
+enable.artifact.update =ENABLE_ARTFCT_UPDATE
+auto.commit =COMMIT_ENABLED
+auto.checkout =CHECKOUT_ENABLED
+artifact.update.interval =ARTFCT_UPDATE_INT
+port.check.timeout =PORT_CHECK_TIMEOUT
enable.data.publisher =ENABLE-DATA-PUBLISHER
monitoring.server.ip =MONITORING-SERVER-IP
monitoring.server.port =MONITORING-SERVER-PORT
http://git-wip-us.apache.org/repos/asf/stratos/blob/19f9227f/tools/python-cartridge-agent/cartridge-agent/logging.ini
----------------------------------------------------------------------
diff --git a/tools/python-cartridge-agent/cartridge-agent/logging.ini b/tools/python-cartridge-agent/cartridge-agent/logging.ini
index f1869f6..2bd3ab4 100644
--- a/tools/python-cartridge-agent/cartridge-agent/logging.ini
+++ b/tools/python-cartridge-agent/cartridge-agent/logging.ini
@@ -47,6 +47,6 @@ args=("error.log", "w")
keys=root
[logger_root]
-level=DEBUG
+level=LOG_LEVEL
formatter=default
handlers=console,error_file,log_file
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/19f9227f/tools/python-cartridge-agent/cartridge-agent/modules/util/cartridgeagentconstants.py
----------------------------------------------------------------------
diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/util/cartridgeagentconstants.py b/tools/python-cartridge-agent/cartridge-agent/modules/util/cartridgeagentconstants.py
index eb94f79..70afb30 100644
--- a/tools/python-cartridge-agent/cartridge-agent/modules/util/cartridgeagentconstants.py
+++ b/tools/python-cartridge-agent/cartridge-agent/modules/util/cartridgeagentconstants.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-JNDI_PROPERTIES_DIR = "jndi.properties.dir"
PARAM_FILE_PATH = "param.file.path"
EXTENSIONS_DIR = "extensions.dir"