홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
f5416d82 1 parent 76622d6e

modified logger declaration 

to print actual instance type.

Change-Id: I4f7f1f0bea51d6fdb586339569b884e6cfdd5d02
Inline Side-by-side
Showing 4 changed files with 2 additions and 20 deletions
...@@ -45,8 +45,7 @@ import org.slf4j.LoggerFactory; ...@@ -45,8 +45,7 @@ import org.slf4j.LoggerFactory;
45 */ 45 */
46 public abstract class AbstractOpenFlowSwitch implements OpenFlowSwitchDriver { 46 public abstract class AbstractOpenFlowSwitch implements OpenFlowSwitchDriver {
47 47
48 - private static Logger log = 48 + protected final Logger log = LoggerFactory.getLogger(getClass());
49 - LoggerFactory.getLogger(AbstractOpenFlowSwitch.class);
50 49
51 protected Channel channel; 50 protected Channel channel;
52 51
......
...@@ -9,16 +9,12 @@ import org.projectfloodlight.openflow.protocol.OFCircuitPortStatus; ...@@ -9,16 +9,12 @@ import org.projectfloodlight.openflow.protocol.OFCircuitPortStatus;
9 import org.projectfloodlight.openflow.protocol.OFCircuitPortsReply; 9 import org.projectfloodlight.openflow.protocol.OFCircuitPortsReply;
10 import org.projectfloodlight.openflow.protocol.OFCircuitPortsRequest; 10 import org.projectfloodlight.openflow.protocol.OFCircuitPortsRequest;
11 import org.projectfloodlight.openflow.protocol.OFDescStatsReply; 11 import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
12 -import org.projectfloodlight.openflow.protocol.OFErrorMsg;
13 import org.projectfloodlight.openflow.protocol.OFMessage; 12 import org.projectfloodlight.openflow.protocol.OFMessage;
14 import org.projectfloodlight.openflow.protocol.OFPortDesc; 13 import org.projectfloodlight.openflow.protocol.OFPortDesc;
15 import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply; 14 import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
16 import org.projectfloodlight.openflow.protocol.OFPortOptical; 15 import org.projectfloodlight.openflow.protocol.OFPortOptical;
17 import org.projectfloodlight.openflow.protocol.OFStatsReply; 16 import org.projectfloodlight.openflow.protocol.OFStatsReply;
18 import org.projectfloodlight.openflow.protocol.OFStatsType; 17 import org.projectfloodlight.openflow.protocol.OFStatsType;
19 -import org.slf4j.Logger;
20 -import org.slf4j.LoggerFactory;
21 -
22 import java.io.IOException; 18 import java.io.IOException;
23 import java.util.ArrayList; 19 import java.util.ArrayList;
24 import java.util.Collection; 20 import java.util.Collection;
...@@ -36,9 +32,6 @@ public class OFOpticalSwitchImplLINC13 extends AbstractOpenFlowSwitch { ...@@ -36,9 +32,6 @@ public class OFOpticalSwitchImplLINC13 extends AbstractOpenFlowSwitch {
36 32
37 private OFPortDescStatsReply wPorts; 33 private OFPortDescStatsReply wPorts;
38 34
39 - private final Logger log =
40 - LoggerFactory.getLogger(OFOpticalSwitchImplLINC13.class);
41 -
42 OFOpticalSwitchImplLINC13(Dpid dpid, OFDescStatsReply desc) { 35 OFOpticalSwitchImplLINC13(Dpid dpid, OFDescStatsReply desc) {
43 super(dpid); 36 super(dpid);
44 driverHandshakeComplete = new AtomicBoolean(false); 37 driverHandshakeComplete = new AtomicBoolean(false);
...@@ -92,7 +85,7 @@ public class OFOpticalSwitchImplLINC13 extends AbstractOpenFlowSwitch { ...@@ -92,7 +85,7 @@ public class OFOpticalSwitchImplLINC13 extends AbstractOpenFlowSwitch {
92 } 85 }
93 break; 86 break;
94 case ERROR: 87 case ERROR:
95 - log.error("Switch {} Error {}", getStringId(), (OFErrorMsg) m); 88 + log.error("Switch {} Error {}", getStringId(), m);
96 break; 89 break;
97 case FEATURES_REPLY: 90 case FEATURES_REPLY:
98 break; 91 break;
......
...@@ -49,8 +49,6 @@ import org.projectfloodlight.openflow.types.TableId; ...@@ -49,8 +49,6 @@ import org.projectfloodlight.openflow.types.TableId;
49 import org.projectfloodlight.openflow.types.U32; 49 import org.projectfloodlight.openflow.types.U32;
50 import org.projectfloodlight.openflow.types.U64; 50 import org.projectfloodlight.openflow.types.U64;
51 import org.projectfloodlight.openflow.util.HexString; 51 import org.projectfloodlight.openflow.util.HexString;
52 -import org.slf4j.Logger;
53 -import org.slf4j.LoggerFactory;
54 52
55 /** 53 /**
56 * OFDescriptionStatistics Vendor (Manufacturer Desc.): Stanford University, 54 * OFDescriptionStatistics Vendor (Manufacturer Desc.): Stanford University,
...@@ -60,9 +58,6 @@ import org.slf4j.LoggerFactory; ...@@ -60,9 +58,6 @@ import org.slf4j.LoggerFactory;
60 */ 58 */
61 public class OFSwitchImplCPqD13 extends AbstractOpenFlowSwitch { 59 public class OFSwitchImplCPqD13 extends AbstractOpenFlowSwitch {
62 60
63 - private final Logger log =
64 - LoggerFactory.getLogger(OFSwitchImplCPqD13.class);
65 -
66 private static final int VLAN_ID_OFFSET = 16; 61 private static final int VLAN_ID_OFFSET = 16;
67 private final AtomicBoolean driverHandshakeComplete; 62 private final AtomicBoolean driverHandshakeComplete;
68 private OFFactory factory; 63 private OFFactory factory;
......
...@@ -21,8 +21,6 @@ import org.projectfloodlight.openflow.protocol.instruction.OFInstruction; ...@@ -21,8 +21,6 @@ import org.projectfloodlight.openflow.protocol.instruction.OFInstruction;
21 import org.projectfloodlight.openflow.types.OFBufferId; 21 import org.projectfloodlight.openflow.types.OFBufferId;
22 import org.projectfloodlight.openflow.types.OFPort; 22 import org.projectfloodlight.openflow.types.OFPort;
23 import org.projectfloodlight.openflow.types.TableId; 23 import org.projectfloodlight.openflow.types.TableId;
24 -import org.slf4j.Logger;
25 -import org.slf4j.LoggerFactory;
26 24
27 /** 25 /**
28 * OFDescriptionStatistics Vendor (Manufacturer Desc.): Nicira, Inc. Make 26 * OFDescriptionStatistics Vendor (Manufacturer Desc.): Nicira, Inc. Make
...@@ -31,9 +29,6 @@ import org.slf4j.LoggerFactory; ...@@ -31,9 +29,6 @@ import org.slf4j.LoggerFactory;
31 */ 29 */
32 public class OFSwitchImplOVS13 extends AbstractOpenFlowSwitch { 30 public class OFSwitchImplOVS13 extends AbstractOpenFlowSwitch {
33 31
34 - private static Logger log =
35 - LoggerFactory.getLogger(OFSwitchImplOVS13.class);
36 -
37 private final AtomicBoolean driverHandshakeComplete; 32 private final AtomicBoolean driverHandshakeComplete;
38 private OFFactory factory; 33 private OFFactory factory;
39 private long barrierXidToWaitFor = -1; 34 private long barrierXidToWaitFor = -1;
......