change trace level

IBMStreams · Jan 17, 2019 · a3b7ec8 · a3b7ec8
1 parent 9d92ae7
commit a3b7ec8
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/com.ibm.streamsx.network/com.ibm.streamsx.network.filter/IPFilter/IPFilter_cpp.cgt b/com.ibm.streamsx.network/com.ibm.streamsx.network.filter/IPFilter/IPFilter_cpp.cgt
@@ -116,23 +116,17 @@ void MY_OPERATOR::process(Tuple const & tuple, uint32_t port) {
 
             SPLAPPTRC(L_TRACE, "Process() non-mutating, port 1.  ipv4FilterAddr = " << ipv4Addr, IP_FILTER);
 
-<<<<<<< HEAD
-            SPL::list<SPL::uint32> addrList = getAllAddressesInNetworkInt(ipv4Addr);
-            SPLAPPTRC(L_TRACE, "Process() non-mutating, port 1.  Adding count = " << addrList.size(), IP_FILTER);
-
-=======
->>>>>>> branch 'master' of git@github.com:IBMStreams/streamsx.network.git
             AutoPortMutex amW(mutex_[ip4ListWSel_], *this);
             SPL::uint32 addrStart, addrEnd;
             SPL::uint32 addrRange = getAddressRangeInNetworkInt(ipv4Addr, addrStart, addrEnd);
-            SPLAPPTRC(L_ERROR, "Process() non-mutating, port 1.  Adding count = " << addrRange << ", start = " << std::hex << addrStart << ", end = " << std::hex << addrEnd, IP_FILTER);
+            SPLAPPTRC(L_TRACE, "Process() non-mutating, port 1.  Adding count = " << addrRange << ", start = " << std::hex << addrStart << ", end = " << std::hex << addrEnd, IP_FILTER);
             for(SPL::uint32 b = addrStart; b < addrEnd; b++) {
                 ip4List_[ip4ListWSel_]->insert(b);
                 SPLAPPTRC(L_TRACE, "IPv4 filter: " << "adding: " << 
                         convertIPV4AddressNumericToString(b) << 
                         "(" << b << ")", IP_FILTER);
             }
-            SPLAPPTRC(L_ERROR, "Process() non-mutating, port 1.  Done Adding", IP_FILTER);
+            SPLAPPTRC(L_TRACE, "Process() non-mutating, port 1.  Done Adding", IP_FILTER);
             return;
 
         }