Updated Branches: refs/heads/master 85ac579e3 -> f195960a4
logout functionality and introducing custom log4j.prop file. the default one does not print org.apache logs to carbon console Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/34f831f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34f831f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34f831f3 Branch: refs/heads/master Commit: 34f831f36b0c1e3fe448b8b8e1f48359c36c0f2d Parents: 639f229 Author: Pradeep Fernando <[email protected]> Authored: Tue Feb 4 00:49:21 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Tue Feb 4 00:49:21 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/logout.jag | 14 +- .../console/themes/theme1/partials/header.hbs | 302 +++++++++---------- products/stratos-manager/conf/log4j.properties | 168 +++++++++++ .../modules/distribution/src/assembly/bin.xml | 2 +- 4 files changed, 330 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34f831f3/components/org.apache.stratos.manager.console/console/controllers/logout.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/logout.jag b/components/org.apache.stratos.manager.console/console/controllers/logout.jag index 461f1b3..67ecfc9 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/logout.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/logout.jag @@ -1,15 +1,21 @@ <% (function(){ - var user = require('store').server.current(session).username;//session.get("LOGGED_IN_USER"); + var log = new Log('controllers.logout'); + var user = require('console').server.current(session).username;//session.get("LOGGED_IN_USER"); + var dataConfig = require('/config/console.json'); if(user === null) { response.sendRedirect('/portal'); - } else { - var config = require('/config/publisher.js').config(), + } else if(!dataConfig.ssoConfiguration.enabled){ + log.debug('invalidating the session...'); + session.invalidate(); + response.sendRedirect(request.getContextPath()); + }else{ + var config = require('/console.json'), sso = require('sso'), sso_sessions = application.get('sso_sessions'), sessionId = session.getId(), encodedSAMLLogoutRequest = sso.client.getEncodedSAMLLogoutRequest(user, sso_sessions[session.getId()], config.ssoConfiguration.issuer), - relayState = '/publisher', + relayState = '/console', postUrl = "https://"; + process.getProperty('carbon.local.ip') + ":" + process.getProperty('https.port'); var log = new Log(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34f831f3/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index ad05362..45ad5a8 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -22,16 +22,16 @@ <ul class="pull-left"> <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li --> <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My Cartridges</span></a></li> - {{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}} + {{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}} {{#isAllowed "tenant-mgt"}}<li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>{{/isAllowed}} </ul> <ul class="pull-right"> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> admin <b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> admin <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a><i class="fa fa-file-text-o"></i> View Profile</a></li> <li> - <a><i class="fa fa-sign-out"></i> logout</a> + <a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a> </li> </ul> </li> @@ -45,7 +45,7 @@ <div class="container"> <div class="row"> {{#unless wizard_on}} - {{#unless config_on}} + {{#unless config_on}} <div class="col-lg-3"> <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a> </div> @@ -69,120 +69,120 @@ {{/if}} </div> {{/if}} - {{/unless}} <!-- configon --> + {{/unless}} <!-- configon --> {{/unless}} <!-- wizardon --> - - - - - {{#if config_on}} - <div class="col-lg-12"> - - <ul class="sub-menu-wizard non-wizard"> - <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=1" }}"> - <div class="wizard-number">1</div> - <div>Partitions</div> - </a> - </li> - - - - <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=2" }}"> - <div class="wizard-number">2</div> - <div>Auto scale Policies</div> - </a> - </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">2</div> - <div>Auto scale Policies</div> - </div> - </li --> - - - <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=3" }}"> - <div class="wizard-number">3</div> - <div>Deployments Policies</div> - </a> - </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">3</div> - <div>Deployments Policies</div> - </div> - </li--> - - - <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=4" }}"> - <div class="wizard-number">4</div> - <div>LBs</div> - </a> - </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">4</div> - <div>LBs</div> - </div> - </li--> - - - <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}> - <a href="{{url "/configure_stratos.jag?step=5" }}"> - <div class="wizard-number">5</div> - <div>Cartridges</div> - </a> - </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">5</div> - <div>Cartridges</div> - </div> - </li --> - - <!-- - ************************************** - UNCOMMENT WHEN THIS FEATURE IS NEEDED - - Remember to add fix the classes - ************************************* - {{#if wizard_on_6}} - <li class="active"> - <a href="{{url "/configure_stratos_wizard.jag?step=5" }}"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </a> - </li> - <li class="sub-menu-wizard-pointer active-pointer no-background"></li> - {{else}} - <li> - <div class="in-active-wizard-item"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </div> - </li> - <li class="sub-menu-wizard-pointer no-background"></li> - {{/if}} - --> - - </ul> - - </div> - - {{/if}} - - - - - - - - - + + + + + {{#if config_on}} + <div class="col-lg-12"> + + <ul class="sub-menu-wizard non-wizard"> + <li {{#ifCond step "==" 1 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=1" }}"> + <div class="wizard-number">1</div> + <div>Partitions</div> + </a> + </li> + + + + <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=2" }}"> + <div class="wizard-number">2</div> + <div>Auto scale Policies</div> + </a> + </li> + <!--li> + <div class="in-active-wizard-item"> + <div class="wizard-number">2</div> + <div>Auto scale Policies</div> + </div> + </li --> + + + <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=3" }}"> + <div class="wizard-number">3</div> + <div>Deployments Policies</div> + </a> + </li> + <!--li> + <div class="in-active-wizard-item"> + <div class="wizard-number">3</div> + <div>Deployments Policies</div> + </div> + </li--> + + + <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=4" }}"> + <div class="wizard-number">4</div> + <div>LBs</div> + </a> + </li> + <!--li> + <div class="in-active-wizard-item"> + <div class="wizard-number">4</div> + <div>LBs</div> + </div> + </li--> + + + <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=5" }}"> + <div class="wizard-number">5</div> + <div>Cartridges</div> + </a> + </li> + <!--li> + <div class="in-active-wizard-item"> + <div class="wizard-number">5</div> + <div>Cartridges</div> + </div> + </li --> + + <!-- + ************************************** + UNCOMMENT WHEN THIS FEATURE IS NEEDED + + Remember to add fix the classes + ************************************* + {{#if wizard_on_6}} + <li class="active"> + <a href="{{url "/configure_stratos_wizard.jag?step=5" }}"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> + </a> + </li> + <li class="sub-menu-wizard-pointer active-pointer no-background"></li> + {{else}} + <li> + <div class="in-active-wizard-item"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> + </div> + </li> + <li class="sub-menu-wizard-pointer no-background"></li> + {{/if}} + --> + + </ul> + + </div> + + {{/if}} + + + + + + + + + {{#if wizard_on}} <div class="col-lg-12"> @@ -190,7 +190,7 @@ <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=1" }}"> <div class="wizard-number">1</div> - <div>Partitions</div> + <div>Partitions</div> </a> </li> <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li> @@ -201,7 +201,7 @@ <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=2" }}"> <div class="wizard-number">2</div> - <div>Auto scale Policies</div> + <div>Auto scale Policies</div> </a> </li> <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li> @@ -209,7 +209,7 @@ <li> <div class="in-active-wizard-item"> <div class="wizard-number">2</div> - <div>Auto scale Policies</div> + <div>Auto scale Policies</div> </div> </li> <li class="sub-menu-wizard-pointer"></li> @@ -220,7 +220,7 @@ <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=3" }}"> <div class="wizard-number">3</div> - <div>Deployments Policies</div> + <div>Deployments Policies</div> </a> </li> <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li> @@ -228,7 +228,7 @@ <li> <div class="in-active-wizard-item"> <div class="wizard-number">3</div> - <div>Deployments Policies</div> + <div>Deployments Policies</div> </div> </li> <li class="sub-menu-wizard-pointer"></li> @@ -239,7 +239,7 @@ <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=4" }}"> <div class="wizard-number">4</div> - <div>LBs</div> + <div>LBs</div> </a> </li> <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li> @@ -247,7 +247,7 @@ <li> <div class="in-active-wizard-item"> <div class="wizard-number">4</div> - <div>LBs</div> + <div>LBs</div> </div> </li> <li class="sub-menu-wizard-pointer"></li> @@ -258,7 +258,7 @@ <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=5" }}"> <div class="wizard-number">5</div> - <div>Cartridges</div> + <div>Cartridges</div> </a> </li> <li class="sub-menu-wizard-pointer active-pointer no-background"></li> @@ -266,36 +266,36 @@ <li> <div class="in-active-wizard-item"> <div class="wizard-number">5</div> - <div>Cartridges</div> - </div> - </li> - <li class="sub-menu-wizard-pointer no-background"></li> - {{/if}} - - <!-- - ************************************** - UNCOMMENT WHEN THIS FEATURE IS NEEDED - - Remember to add fix the classes - ************************************* - {{#if wizard_on_6}} - <li class="active"> - <a href="{{url "/configure_stratos_wizard.jag?step=6" }}"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </a> - </li> - <li class="sub-menu-wizard-pointer active-pointer no-background"></li> - {{else}} - <li> - <div class="in-active-wizard-item"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> + <div>Cartridges</div> + </div> + </li> + <li class="sub-menu-wizard-pointer no-background"></li> + {{/if}} + + <!-- + ************************************** + UNCOMMENT WHEN THIS FEATURE IS NEEDED + + Remember to add fix the classes + ************************************* + {{#if wizard_on_6}} + <li class="active"> + <a href="{{url "/configure_stratos_wizard.jag?step=6" }}"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> + </a> + </li> + <li class="sub-menu-wizard-pointer active-pointer no-background"></li> + {{else}} + <li> + <div class="in-active-wizard-item"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> </div> </li> <li class="sub-menu-wizard-pointer no-background"></li> {{/if}} - --> + --> </ul> @@ -311,7 +311,7 @@ <div class="col-lg-3"> </div> <div class="col-lg-6"> - <i class="icon-exclamation"></i> Configure Stratos is not completed. <a href="{{url "/configure_stratos_wizard.jag"}}">Take the Wizard</a> + <i class="icon-exclamation"></i> Configure Stratos is not completed. <a href="{{url "/configure_stratos_wizard.jag"}}">Take the Wizard</a> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34f831f3/products/stratos-manager/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/products/stratos-manager/conf/log4j.properties b/products/stratos-manager/conf/log4j.properties new file mode 100755 index 0000000..959b8d3 --- /dev/null +++ b/products/stratos-manager/conf/log4j.properties @@ -0,0 +1,168 @@ +# +# Copyright 2009 WSO2, Inc. (http://wso2.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# This is the log4j configuration file used by WSO2 Carbon +# +# IMPORTANT : Please do not remove or change the names of any +# of the Appenders defined here. The layout pattern & log file +# can be changed using the WSO2 Carbon Management Console, and those +# settings will override the settings in this file. +# + +log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY + +log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE +log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE +log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.stratos.rest.endpoint=INFO,CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.catalina=WARN +log4j.logger.org.apache.tomcat=WARN +log4j.logger.org.wso2.carbon.apacheds=WARN +log4j.logger.org.apache.directory.server.ldap=WARN +log4j.logger.org.apache.directory.server.core.event=WARN +log4j.logger.com.atomikos=INFO,ATOMIKOS +log4j.logger.org.quartz=WARN +log4j.logger.org.apache.jackrabbit.webdav=WARN +log4j.logger.org.apache.juddi=ERROR +log4j.logger.org.apache.commons.digester.Digester=WARN +log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN +log4j.logger.org.apache.qpid=WARN +log4j.logger.org.apache.qpid.server.Main=INFO +log4j.logger.qpid.message=WARN +log4j.logger.qpid.message.broker.listening=INFO +log4j.logger.org.apache.tiles=WARN +log4j.logger.org.apache.commons.httpclient=ERROR +log4j.logger.org.apache.coyote=WARN +log4j.logger.org.apache.solr=ERROR +log4j.logger.org.infinispan=WARN +log4j.logger.org.jgroups=ERROR +log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR +log4j.logger.org.wso2=INFO +log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY +#Following are to remove false error messages from startup (IS) +log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY +log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY +#Hive Related Log configurations +log4j.logger.DataNucleus=ERROR +log4j.logger.Datastore=ERROR +log4j.logger.Datastore.Schema=ERROR +log4j.logger.JPOX.Datastore=ERROR +log4j.logger.JPOX.Plugin=ERROR +log4j.logger.JPOX.MetaData=ERROR +log4j.logger.JPOX.Query=ERROR +log4j.logger.JPOX.General=ERROR +log4j.logger.JPOX.Enhancer=ERROR +log4j.logger.org.apache.hadoop.hive=WARN +log4j.logger.hive=WARN +log4j.logger.ExecMapper=WARN +log4j.logger.ExecReducer=WARN +log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR + +log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE + +log4j.additivity.org.apache.axis2.clustering=false +log4j.additivity.com.atomikos=false +log4j.additivity.org.apache=false + +# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CARBON_CONSOLE=org.wso2.carbon.logging.appenders.CarbonConsoleAppender +log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +# ConversionPattern will be overridden by the configuration setting in the DB +log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n +log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T] +log4j.appender.CARBON_CONSOLE.threshold=DEBUG + +# The memory appender for logging +log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.appender.CarbonMemoryAppender +log4j.appender.CARBON_MEMORY.bufferSize=2000 +log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +# ConversionPattern will be overridden by the configuration setting in the DB +log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n +log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace +log4j.appender.CARBON_MEMORY.threshold=DEBUG + +# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. +log4j.appender.CARBON_LOGFILE=org.wso2.carbon.logging.appenders.CarbonDailyRollingFileAppender +# Log file will be overridden by the configuration setting in the DB +# This path should be relative to WSO2 Carbon Home +log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log +log4j.appender.CARBON_LOGFILE.Append=true +log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +# ConversionPattern will be overridden by the configuration setting in the DB +log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n +log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.CARBON_LOGFILE.threshold=DEBUG + +log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender +log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout +log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m {%c}%n +log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost +log4j.appender.CARBON_SYS_LOG.Facility=USER +log4j.appender.CARBON_SYS_LOG.threshold=DEBUG + +# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT +log4j.appender.LOGEVENT=org.wso2.carbon.logging.appender.LogEventAppender +log4j.appender.LOGEVENT.url=tcp://localhost:7611 +log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%I,%Stacktrace +log4j.appender.LOGEVENT.userName=admin +log4j.appender.LOGEVENT.password=admin +log4j.appender.LOGEVENT.processingLimit=1000 +log4j.appender.LOGEVENT.maxTolerableConsecutiveFailure=20 + +# Appender config to CARBON_TRACE_LOGFILE +log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log +log4j.appender.CARBON_TRACE_LOGFILE.Append=true +log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m {%c}%n +log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE +log4j.additivity.trace.messages=false + +# Appender config to AUDIT_LOGFILE +log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log +log4j.appender.AUDIT_LOGFILE.Append=true +log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout +log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n +log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] +log4j.appender.AUDIT_LOGFILE.threshold=INFO +log4j.additivity.AUDIT_LOG=false + +# Appender config to send Atomikos transaction logs to new log file tm.out. +log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender +log4j.appender.ATOMIKOS.File = repository/logs/tm.out +log4j.appender.ATOMIKOS.Append = true +log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout +log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n + +# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console. + +# Specification of Handler used by Console Logger +handlers=java.util.logging.ConsoleHandler + +# Replacing default INFO level with SEVERE +java.util.logging.ConsoleHandler.level=SEVERE http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34f831f3/products/stratos-manager/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos-manager/modules/distribution/src/assembly/bin.xml b/products/stratos-manager/modules/distribution/src/assembly/bin.xml index af02443..b621eef 100755 --- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml +++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml @@ -616,7 +616,7 @@ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory> </file> <file> - <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties</source> + <source>../../conf/log4j.properties</source> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> </file> <file>
