Reduced logging using configuration parameter
This commit is contained in:
		
							parent
							
								
									80d7e3d609
								
							
						
					
					
						commit
						766a56fa9e
					
				@ -2,6 +2,7 @@ before_install:
 | 
				
			|||||||
  - sudo rm -f /etc/mavenrc
 | 
					  - sudo rm -f /etc/mavenrc
 | 
				
			||||||
  - export M2_HOME=/usr/local/maven
 | 
					  - export M2_HOME=/usr/local/maven
 | 
				
			||||||
  - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m"
 | 
					  - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m"
 | 
				
			||||||
 | 
					  - export HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
 | 
				
			||||||
jdk:
 | 
					jdk:
 | 
				
			||||||
 - oraclejdk8
 | 
					 - oraclejdk8
 | 
				
			||||||
language: java
 | 
					language: java
 | 
				
			||||||
 | 
				
			|||||||
@ -131,7 +131,8 @@ public class AppActor extends RuleChainManagerActor {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) {
 | 
					    private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) {
 | 
				
			||||||
        if (SYSTEM_TENANT.equals(msg.getTenantId())) {
 | 
					        if (SYSTEM_TENANT.equals(msg.getTenantId())) {
 | 
				
			||||||
            log.warn("[{}] Invalid service to rule engine msg called. System messages are not supported yet: {}", SYSTEM_TENANT, msg);
 | 
					//            this may be a notification about system entities created.
 | 
				
			||||||
 | 
					//            log.warn("[{}] Invalid service to rule engine msg called. System messages are not supported yet: {}", SYSTEM_TENANT, msg);
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            getOrCreateTenantActor(msg.getTenantId()).tell(msg, self());
 | 
					            getOrCreateTenantActor(msg.getTenantId()).tell(msg, self());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@ -189,8 +190,6 @@ public class AppActor extends RuleChainManagerActor {
 | 
				
			|||||||
            boolean removed = tenantActors.inverse().remove(terminated) != null;
 | 
					            boolean removed = tenantActors.inverse().remove(terminated) != null;
 | 
				
			||||||
            if (removed) {
 | 
					            if (removed) {
 | 
				
			||||||
                log.debug("[{}] Removed actor:", terminated);
 | 
					                log.debug("[{}] Removed actor:", terminated);
 | 
				
			||||||
            } else {
 | 
					 | 
				
			||||||
                log.warn("[{}] Removed actor was not found in the tenant map!");
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            throw new IllegalStateException("Remote actors are not supported!");
 | 
					            throw new IllegalStateException("Remote actors are not supported!");
 | 
				
			||||||
 | 
				
			|||||||
@ -19,9 +19,11 @@ import com.datastax.driver.core.utils.UUIDs;
 | 
				
			|||||||
import com.fasterxml.jackson.databind.ObjectMapper;
 | 
					import com.fasterxml.jackson.databind.ObjectMapper;
 | 
				
			||||||
import com.fasterxml.jackson.databind.node.ArrayNode;
 | 
					import com.fasterxml.jackson.databind.node.ArrayNode;
 | 
				
			||||||
import com.fasterxml.jackson.databind.node.ObjectNode;
 | 
					import com.fasterxml.jackson.databind.node.ObjectNode;
 | 
				
			||||||
 | 
					import lombok.Getter;
 | 
				
			||||||
import lombok.extern.slf4j.Slf4j;
 | 
					import lombok.extern.slf4j.Slf4j;
 | 
				
			||||||
import org.apache.commons.lang3.StringUtils;
 | 
					import org.apache.commons.lang3.StringUtils;
 | 
				
			||||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
					import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			||||||
 | 
					import org.springframework.beans.factory.annotation.Value;
 | 
				
			||||||
import org.springframework.security.core.Authentication;
 | 
					import org.springframework.security.core.Authentication;
 | 
				
			||||||
import org.springframework.security.core.context.SecurityContextHolder;
 | 
					import org.springframework.security.core.context.SecurityContextHolder;
 | 
				
			||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
 | 
					import org.springframework.web.bind.annotation.ExceptionHandler;
 | 
				
			||||||
@ -152,6 +154,11 @@ public abstract class BaseController {
 | 
				
			|||||||
    @Autowired
 | 
					    @Autowired
 | 
				
			||||||
    protected AttributesService attributesService;
 | 
					    protected AttributesService attributesService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Value("${server.log_controller_error_stack_trace}")
 | 
				
			||||||
 | 
					    @Getter
 | 
				
			||||||
 | 
					    private boolean logControllerErrorStackTrace;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @ExceptionHandler(ThingsboardException.class)
 | 
					    @ExceptionHandler(ThingsboardException.class)
 | 
				
			||||||
    public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
 | 
					    public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
 | 
				
			||||||
        errorResponseHandler.handle(ex, response);
 | 
					        errorResponseHandler.handle(ex, response);
 | 
				
			||||||
@ -162,7 +169,7 @@ public abstract class BaseController {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private ThingsboardException handleException(Exception exception, boolean logException) {
 | 
					    private ThingsboardException handleException(Exception exception, boolean logException) {
 | 
				
			||||||
        if (logException) {
 | 
					        if (logException && logControllerErrorStackTrace) {
 | 
				
			||||||
            log.error("Error [{}]", exception.getMessage(), exception);
 | 
					            log.error("Error [{}]", exception.getMessage(), exception);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -31,6 +31,7 @@ server:
 | 
				
			|||||||
    key-store-type: "${SSL_KEY_STORE_TYPE:PKCS12}"
 | 
					    key-store-type: "${SSL_KEY_STORE_TYPE:PKCS12}"
 | 
				
			||||||
    # Alias that identifies the key in the key store
 | 
					    # Alias that identifies the key in the key store
 | 
				
			||||||
    key-alias: "${SSL_KEY_ALIAS:tomcat}"
 | 
					    key-alias: "${SSL_KEY_ALIAS:tomcat}"
 | 
				
			||||||
 | 
					  log_controller_error_stack_trace: "${HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE:true}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Zookeeper connection parameters. Used for service discovery.
 | 
					# Zookeeper connection parameters. Used for service discovery.
 | 
				
			||||||
zk:
 | 
					zk:
 | 
				
			||||||
 | 
				
			|||||||
@ -9,7 +9,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <logger name="org.thingsboard.server" level="WARN"/>
 | 
					    <logger name="org.thingsboard.server" level="WARN"/>
 | 
				
			||||||
    <logger name="org.springframework" level="WARN"/>
 | 
					    <logger name="org.springframework" level="WARN"/>
 | 
				
			||||||
    <logger name="org.springframework.boot.test" level="DEBUG"/>
 | 
					    <logger name="org.springframework.boot.test" level="WARN"/>
 | 
				
			||||||
    <logger name="org.apache.cassandra" level="WARN"/>
 | 
					    <logger name="org.apache.cassandra" level="WARN"/>
 | 
				
			||||||
    <logger name="org.cassandraunit" level="INFO"/>
 | 
					    <logger name="org.cassandraunit" level="INFO"/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user