Browse Source

添加全局异常处理,修改日志打印

weijianghai 1 year ago
parent
commit
1559310f90

+ 477 - 0
.gitignore

@@ -165,3 +165,480 @@ local.properties
 *.iml
 out
 gen
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Maven template
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+
+### VisualStudioCode template
+
+# Local History for Visual Studio Code
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+
+# Generated files
+
+# Sensitive or high-churn files
+
+# Gradle
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+
+# Mongo Explorer plugin
+
+# File-based project format
+
+# IntelliJ
+
+# mpeltonen/sbt-idea plugin
+
+# JIRA plugin
+
+# Cursive Clojure plugin
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+
+# Editor-based Rest Client
+
+# Android studio 3.1+ serialized cache file
+
+### Eclipse template
+
+# External tool builders
+
+# Locally stored "Eclipse launch configurations"
+
+# PyDev specific (Python IDE for Eclipse)
+
+# CDT-specific (C/C++ Development Tooling)
+
+# CDT- autotools
+
+# Java annotation processor (APT)
+
+# PDT-specific (PHP Development Tools)
+
+# sbteclipse plugin
+
+# Tern plugin
+
+# TeXlipse plugin
+
+# STS (Spring Tool Suite)
+
+# Code Recommenders
+
+# Annotation Processing
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+### VisualStudio template
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp_proj
+*_wpftmp.csproj
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+

+ 6 - 0
scripts/rollback.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sh stop.sh
+rm -rf sms_server.jar
+mv sms_server.jar.bak sms_server.jar
+sh run.sh

+ 3 - 0
scripts/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup java -jar sms_server.jar >/dev/null 2>&1 &

+ 5 - 0
scripts/stop.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for i in $(pgrep -f sms_server.jar); do
+  kill -9 "$i"
+done

+ 7 - 0
scripts/update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -rf sms_server.jar.bak
+sh stop.sh
+mv sms_server.jar sms_server.jar.bak
+mv sms_server.jar.new sms_server.jar
+sh run.sh

+ 22 - 0
src/main/java/com/nokia/sms/config/web/ControllerExceptionHandler.java

@@ -0,0 +1,22 @@
+package com.nokia.sms.config.web;
+
+import com.nokia.common.http.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * 请求异常处理
+ */
+@Slf4j
+@RestControllerAdvice
+public class ControllerExceptionHandler
+{
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<Object> exceptionHandler(Exception e)
+    {
+        log.error("╭( ′• o •′ )╭☞ 发生错误了 {}", e.getMessage(), e);
+        return ResponseEntity.ok().body(R.error());
+    }
+}

+ 20 - 0
src/main/java/com/nokia/sms/controller/TestController.java

@@ -0,0 +1,20 @@
+package com.nokia.sms.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RequestMapping("/test")
+@RestController
+public class TestController {
+    /**
+     * 短信告警测试
+     */
+    @GetMapping("/alert")
+    public Object alert() {
+        log.error("短信告警测试");
+        return "ok";
+    }
+}

+ 140 - 126
src/main/java/com/nokia/sms/sgip/filter/SGIPLoggingFilter.java

@@ -1,25 +1,24 @@
 package com.nokia.sms.sgip.filter;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.filterchain.IoFilter;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.write.WriteRequest;
-import org.apache.mina.filter.logging.LogLevel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+@Slf4j
 public class SGIPLoggingFilter extends IoFilterAdapter {
     private final String name;
-    private final Logger logger;
-    private LogLevel exceptionCaughtLevel = LogLevel.WARN;
-    private LogLevel messageSentLevel = LogLevel.INFO;
-    private LogLevel messageReceivedLevel = LogLevel.INFO;
-    private LogLevel sessionCreatedLevel = LogLevel.INFO;
-    private LogLevel sessionOpenedLevel = LogLevel.INFO;
-    private LogLevel sessionIdleLevel = LogLevel.INFO;
-    private LogLevel sessionClosedLevel = LogLevel.INFO;
+//    private final Logger logger;
+//    private LogLevel exceptionCaughtLevel = LogLevel.WARN;
+//    private LogLevel messageSentLevel = LogLevel.INFO;
+//    private LogLevel messageReceivedLevel = LogLevel.INFO;
+//    private LogLevel sessionCreatedLevel = LogLevel.INFO;
+//    private LogLevel sessionOpenedLevel = LogLevel.INFO;
+//    private LogLevel sessionIdleLevel = LogLevel.INFO;
+//    private LogLevel sessionClosedLevel = LogLevel.INFO;
 
     public SGIPLoggingFilter() {
         this(SGIPLoggingFilter.class.getName());
@@ -35,70 +34,73 @@ public class SGIPLoggingFilter extends IoFilterAdapter {
         } else {
             this.name = name;
         }
-        this.logger = LoggerFactory.getLogger(this.name);
+//        this.logger = LoggerFactory.getLogger(this.name);
     }
 
     public String getName() {
         return this.name;
     }
 
-  private void log(LogLevel eventLevel, String message, Throwable cause)
-  {
-    switch (eventLevel.ordinal())
-    {
-    case 1: 
-      this.logger.trace(message, cause);return;
-    case 2: 
-      this.logger.debug(message, cause);return;
-    case 3: 
-      this.logger.info(message, cause);return;
-    case 4: 
-      this.logger.warn(message, cause);return;
-    case 5: 
-      this.logger.error(message, cause);return;
-    }
-  }
-
-  private void log(LogLevel eventLevel, String message, Object param)
-  {
-    switch (eventLevel.ordinal())
-    {
-    case 1: 
-      this.logger.trace(message, param);return;
-    case 2: 
-      this.logger.debug(message, param);return;
-    case 3: 
-      this.logger.info(message, param);return;
-    case 4: 
-      this.logger.warn(message, param);return;
-    case 5: 
-      this.logger.error(message, param);return;
-    }
-  }
-
-  private void log(LogLevel eventLevel, String message)
-  {
-    switch (eventLevel.ordinal())
-    {
-    case 1: 
-      this.logger.trace(message);return;
-    case 2: 
-      this.logger.debug(message);return;
-    case 3: 
-      this.logger.info(message);return;
-    case 4: 
-      this.logger.warn(message);return;
-    case 5: 
-      this.logger.error(message);return;
-    }
-  }
-
+//  private void log(LogLevel eventLevel, String message, Throwable cause)
+//  {
+//    switch (eventLevel.ordinal())
+//    {
+//    case 1:
+//      this.logger.trace(message, cause);return;
+//    case 2:
+//      this.logger.debug(message, cause);return;
+//    case 3:
+//      this.logger.info(message, cause);return;
+//    case 4:
+//      this.logger.warn(message, cause);return;
+//    case 5:
+//      this.logger.error(message, cause);return;
+//    }
+//  }
+//
+//  private void log(LogLevel eventLevel, String message, Object param)
+//  {
+//    switch (eventLevel.ordinal())
+//    {
+//    case 1:
+//      this.logger.trace(message, param);return;
+//    case 2:
+//      this.logger.debug(message, param);return;
+//    case 3:
+//      this.logger.info(message, param);return;
+//    case 4:
+//      this.logger.warn(message, param);return;
+//    case 5:
+//      this.logger.error(message, param);return;
+//    }
+//  }
+//
+//  private void log(LogLevel eventLevel, String message)
+//  {
+//    switch (eventLevel.ordinal())
+//    {
+//    case 1:
+//      this.logger.trace(message);return;
+//    case 2:
+//      this.logger.debug(message);return;
+//    case 3:
+//      this.logger.info(message);return;
+//    case 4:
+//      this.logger.warn(message);return;
+//    case 5:
+//      this.logger.error(message);return;
+//    }
+//  }
+
+    @Override
     public void exceptionCaught(IoFilter.NextFilter nextFilter, IoSession session, Throwable cause)
             throws Exception {
-        log(this.exceptionCaughtLevel, "EXCEPTION :", cause);
+//        log(this.exceptionCaughtLevel, "EXCEPTION :", cause);
+        log.error(cause.getMessage(), cause);
         nextFilter.exceptionCaught(session, cause);
     }
 
+    @Override
     public void messageReceived(IoFilter.NextFilter nextFilter, IoSession session, Object message)
             throws Exception {
         if (IoBuffer.class.isAssignableFrom(message.getClass())) {
@@ -106,96 +108,108 @@ public class SGIPLoggingFilter extends IoFilterAdapter {
             int oldPosition = buffer.position();
             int lengthLimit = buffer.getInt();
             buffer.position(oldPosition);
-            log(this.messageReceivedLevel, "RECEIVED: {}", "HexDump[" + buffer.getHexDump(lengthLimit) + "]");
+//            log(this.messageReceivedLevel, "RECEIVED: {}", "HexDump[" + buffer.getHexDump(lengthLimit) + "]");
+            log.info("RECEIVED: {}", "HexDump[" + buffer.getHexDump(lengthLimit) + "]");
         } else {
-            log(this.messageReceivedLevel, "RECEIVED: {}", message);
+//            log(this.messageReceivedLevel, "RECEIVED: {}", message);
+            log.info("RECEIVED: {}", message);
         }
         nextFilter.messageReceived(session, message);
     }
 
+    @Override
     public void messageSent(IoFilter.NextFilter nextFilter, IoSession session, WriteRequest writeRequest)
             throws Exception {
-        log(this.messageSentLevel, "SENT: {}", writeRequest.getMessage());
+//        log(this.messageSentLevel, "SENT: {}", writeRequest.getMessage());
+        log.info("SENT: {}", writeRequest.getMessage());
         nextFilter.messageSent(session, writeRequest);
     }
 
+    @Override
     public void sessionCreated(IoFilter.NextFilter nextFilter, IoSession session)
             throws Exception {
-        log(this.sessionCreatedLevel, "CREATED " + session.getRemoteAddress());
+//        log(this.sessionCreatedLevel, "CREATED " + session.getRemoteAddress());
+        log.info("CREATED " + session.getRemoteAddress());
         nextFilter.sessionCreated(session);
     }
 
+    @Override
     public void sessionOpened(IoFilter.NextFilter nextFilter, IoSession session)
             throws Exception {
-        log(this.sessionOpenedLevel, "OPENED " + session.getRemoteAddress());
+//        log(this.sessionOpenedLevel, "OPENED " + session.getRemoteAddress());
+        log.info("OPENED " + session.getRemoteAddress());
         nextFilter.sessionOpened(session);
     }
 
+    @Override
     public void sessionIdle(IoFilter.NextFilter nextFilter, IoSession session, IdleStatus status)
             throws Exception {
-        log(this.sessionIdleLevel, "IDLE");
+//        log(this.sessionIdleLevel, "IDLE");
+        log.info("IDLE");
         nextFilter.sessionIdle(session, status);
     }
 
+    @Override
     public void sessionClosed(IoFilter.NextFilter nextFilter, IoSession session)
             throws Exception {
-        log(this.sessionClosedLevel, "CLOSED " + session.getRemoteAddress());
+//        log(this.sessionClosedLevel, "CLOSED " + session.getRemoteAddress());
+        log.info("CLOSED {}", session.getRemoteAddress());
         nextFilter.sessionClosed(session);
     }
 
-    public void setExceptionCaughtLogLevel(LogLevel level) {
-        this.exceptionCaughtLevel = level;
-    }
-
-    public LogLevel getExceptionCaughtLogLevel() {
-        return this.exceptionCaughtLevel;
-    }
-
-    public void setMessageReceivedLogLevel(LogLevel level) {
-        this.messageReceivedLevel = level;
-    }
-
-    public LogLevel getMessageReceivedLogLevel() {
-        return this.messageReceivedLevel;
-    }
-
-    public void setMessageSentLogLevel(LogLevel level) {
-        this.messageSentLevel = level;
-    }
-
-    public LogLevel getMessageSentLogLevel() {
-        return this.messageSentLevel;
-    }
-
-    public void setSessionCreatedLogLevel(LogLevel level) {
-        this.sessionCreatedLevel = level;
-    }
-
-    public LogLevel getSessionCreatedLogLevel() {
-        return this.sessionCreatedLevel;
-    }
-
-    public void setSessionOpenedLogLevel(LogLevel level) {
-        this.sessionOpenedLevel = level;
-    }
-
-    public LogLevel getSessionOpenedLogLevel() {
-        return this.sessionOpenedLevel;
-    }
-
-    public void setSessionIdleLogLevel(LogLevel level) {
-        this.sessionIdleLevel = level;
-    }
-
-    public LogLevel getSessionIdleLogLevel() {
-        return this.sessionIdleLevel;
-    }
-
-    public void setSessionClosedLogLevel(LogLevel level) {
-        this.sessionClosedLevel = level;
-    }
-
-    public LogLevel getSessionClosedLogLevel() {
-        return this.sessionClosedLevel;
-    }
+//    public void setExceptionCaughtLogLevel(LogLevel level) {
+//        this.exceptionCaughtLevel = level;
+//    }
+//
+//    public LogLevel getExceptionCaughtLogLevel() {
+//        return this.exceptionCaughtLevel;
+//    }
+//
+//    public void setMessageReceivedLogLevel(LogLevel level) {
+//        this.messageReceivedLevel = level;
+//    }
+//
+//    public LogLevel getMessageReceivedLogLevel() {
+//        return this.messageReceivedLevel;
+//    }
+//
+//    public void setMessageSentLogLevel(LogLevel level) {
+//        this.messageSentLevel = level;
+//    }
+//
+//    public LogLevel getMessageSentLogLevel() {
+//        return this.messageSentLevel;
+//    }
+//
+//    public void setSessionCreatedLogLevel(LogLevel level) {
+//        this.sessionCreatedLevel = level;
+//    }
+//
+//    public LogLevel getSessionCreatedLogLevel() {
+//        return this.sessionCreatedLevel;
+//    }
+//
+//    public void setSessionOpenedLogLevel(LogLevel level) {
+//        this.sessionOpenedLevel = level;
+//    }
+//
+//    public LogLevel getSessionOpenedLogLevel() {
+//        return this.sessionOpenedLevel;
+//    }
+//
+//    public void setSessionIdleLogLevel(LogLevel level) {
+//        this.sessionIdleLevel = level;
+//    }
+//
+//    public LogLevel getSessionIdleLogLevel() {
+//        return this.sessionIdleLevel;
+//    }
+//
+//    public void setSessionClosedLogLevel(LogLevel level) {
+//        this.sessionClosedLevel = level;
+//    }
+//
+//    public LogLevel getSessionClosedLogLevel() {
+//        return this.sessionClosedLevel;
+//    }
 }

+ 7 - 8
src/main/java/com/nokia/sms/sgip/mo/server/MOServer.java

@@ -11,7 +11,6 @@ import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.executor.ExecutorFilter;
 import org.apache.mina.filter.executor.UnorderedThreadPoolExecutor;
-import org.apache.mina.filter.logging.LogLevel;
 import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 
@@ -44,13 +43,13 @@ public class MOServer {
             IoFilter coderFilter = new ProtocolCodecFilter(new SgipCodecFactory());
             SGIPLoggingFilter logFilter = new SGIPLoggingFilter();
 
-            logFilter.setExceptionCaughtLogLevel(LogLevel.NONE);
-            logFilter.setSessionCreatedLogLevel(LogLevel.NONE);
-            logFilter.setSessionOpenedLogLevel(LogLevel.NONE);
-            logFilter.setSessionIdleLogLevel(LogLevel.NONE);
-            logFilter.setMessageSentLogLevel(LogLevel.NONE);
-            logFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
-            logFilter.setSessionClosedLogLevel(LogLevel.NONE);
+//            logFilter.setExceptionCaughtLogLevel(LogLevel.NONE);
+//            logFilter.setSessionCreatedLogLevel(LogLevel.NONE);
+//            logFilter.setSessionOpenedLogLevel(LogLevel.NONE);
+//            logFilter.setSessionIdleLogLevel(LogLevel.NONE);
+//            logFilter.setMessageSentLogLevel(LogLevel.NONE);
+//            logFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
+//            logFilter.setSessionClosedLogLevel(LogLevel.NONE);
             this.acceptor.getFilterChain().addLast("logFilter1", logFilter);
             this.acceptor.getFilterChain().addLast("coderFilter", coderFilter);
             this.acceptor.getFilterChain().addLast("logger", new LoggingFilter());

+ 7 - 8
src/main/java/com/nokia/sms/sgip/mt/client/MTClient.java

@@ -21,7 +21,6 @@ import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.executor.ExecutorFilter;
 import org.apache.mina.filter.executor.UnorderedThreadPoolExecutor;
-import org.apache.mina.filter.logging.LogLevel;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 
 import java.io.UnsupportedEncodingException;
@@ -54,13 +53,13 @@ public class MTClient {
         if (log.isDebugEnabled()) {
             SGIPLoggingFilter logFilter = new SGIPLoggingFilter("MTClienter");
 
-            logFilter.setExceptionCaughtLogLevel(LogLevel.NONE);
-            logFilter.setSessionCreatedLogLevel(LogLevel.NONE);
-            logFilter.setSessionOpenedLogLevel(LogLevel.NONE);
-            logFilter.setSessionIdleLogLevel(LogLevel.NONE);
-            logFilter.setMessageSentLogLevel(LogLevel.NONE);
-            logFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
-            logFilter.setSessionClosedLogLevel(LogLevel.NONE);
+//            logFilter.setExceptionCaughtLogLevel(LogLevel.NONE);
+//            logFilter.setSessionCreatedLogLevel(LogLevel.NONE);
+//            logFilter.setSessionOpenedLogLevel(LogLevel.NONE);
+//            logFilter.setSessionIdleLogLevel(LogLevel.NONE);
+//            logFilter.setMessageSentLogLevel(LogLevel.NONE);
+//            logFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
+//            logFilter.setSessionClosedLogLevel(LogLevel.NONE);
             this.connector.getFilterChain().addLast("MTClienter1", logFilter);
         }
         IoFilter coderFilter = new ProtocolCodecFilter(new SgipCodecFactory());