Revision: 15569
Author: baranowb
Date: Tue Nov 30 02:16:54 2010
Log: Fixes Issue 2148
Fix content of logs so its more consistent.
Remove double logs.
http://code.google.com/p/mobicents/source/detail?r=15569

Modified:
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java

=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java Tue Nov 30 00:57:12 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java Tue Nov 30 02:16:54 2010
@@ -613,9 +613,6 @@
                         start_T3();
                         //this.state = MTP2_ALIGNED;

-                        if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Aligned", name));
-                        }
                         this.setState(MTP2_ALIGNED);
                         break;
                     case FRAME_STATUS_INDICATION_E:
@@ -635,9 +632,6 @@
                         // 5. set state
                         //this.state = MTP2_ALIGNED;

-                        if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Aligned", name));
-                        }
                         this.setState(MTP2_ALIGNED);
                         break;
                     default:
@@ -673,9 +667,6 @@
                         // 7. set state
                         //this.state = MTP2_PROVING;

-                        if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Proving", name));
-                        }
                         this.setState(MTP2_PROVING);
                         break;
                     case FRAME_STATUS_INDICATION_OS:
@@ -708,9 +699,6 @@
                         // 4. swithc state
                         //this.state = MTP2_ALIGNED;

-                        if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Aligned", name));
-                        }
                         this.setState(MTP2_ALIGNED);
                         break;
                     case FRAME_STATUS_INDICATION_E:
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java Tue Nov 30 01:04:21 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java Tue Nov 30 02:16:54 2010
@@ -318,7 +318,10 @@
                                 linkUp(mtp2);
                             }
                         } else {
- //logger.info("SLTA pattern does not match: \n"+Arrays.toString(sif)+"\n"+Arrays.toString(SLTM_PATTERN));
+                               if(logger.isEnabledFor(Level.WARN))
+                               {
+ logger.warn("SLTA pattern does not match: \n"+Arrays.toString(sif)+"\n"+Arrays.toString(SLTM_PATTERN));
+                               }
                         }
                     } else {
                        if(logger.isEnabledFor(Level.WARN))
@@ -406,7 +409,7 @@
     public void linkInService(Mtp2 link) {
         //restart traffic
         if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Sending Traffic Restart Allowed message", link.getName())); + logger.debug(String.format("(%s) Sending TRA(Traffic Restart Allowed) message", link.getName()));
         }
         restartTraffic(link);

@@ -417,7 +420,7 @@

             //start tester
             if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Starting link test procedure", link.getName())); + logger.debug(String.format("(%s) Starting link test procedure(SLTM/SLTA)", link.getName()));
             }
             tester.start();
         } else {
@@ -549,7 +552,7 @@
             //shcedule next ping
             executor.schedule(this, Mtp3.TIMEOUT_T2_SLTM * 1000);
             if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Test message acknowledged, Link test passed", link.getName())); + logger.debug(String.format("(%s) SLTM acknowledged, Link test passed", link.getName()));
             }
         }

@@ -576,7 +579,7 @@
             //scheduling timeout
             executor.schedule(this, (int)(timeout * 1000));
             if (logger.isDebugEnabled()) {
- logger.debug(String.format("(%s) Test request, try number = %d", link.getName(), tryCount)); + logger.debug(String.format("(%s) SLTM sent, try number = %d", link.getName(), tryCount));
             }
         }

Reply via email to