Skip to content

Commit 6c5482c

Browse files
committed
Removed or replaced System.out.println debug statements with LOGGER
1 parent f4585c2 commit 6c5482c

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -920,9 +920,6 @@ private static class ReadSituConfigMapStep extends ResponseStep<V1ConfigMap> {
920920

921921
@Override
922922
public NextAction onFailure(Packet packet, CallResponse<V1ConfigMap> callResponse) {
923-
System.out.println(
924-
"ReadSituConfigMapStep.onFailure callResponse.getStatusCode: "
925-
+ callResponse.getStatusCode());
926923
return callResponse.getStatusCode() == CallBuilder.NOT_FOUND
927924
? onSuccess(packet, callResponse)
928925
: super.onFailure(packet, callResponse);
@@ -931,12 +928,10 @@ public NextAction onFailure(Packet packet, CallResponse<V1ConfigMap> callRespons
931928
@Override
932929
public NextAction onSuccess(Packet packet, CallResponse<V1ConfigMap> callResponse) {
933930
V1ConfigMap result = callResponse.getResult();
934-
System.out.println("ReadSituConfigMapStep.onSuccess result: " + result);
935931
if (result != null) {
936932
Map<String, String> data = result.getData();
937933
String topologyYaml = data.get("topology.yaml");
938934
if (topologyYaml != null) {
939-
System.out.println("topology.yaml: " + topologyYaml);
940935
ConfigMapHelper.DomainTopology domainTopology =
941936
ConfigMapHelper.parseDomainTopologyYaml(topologyYaml);
942937
WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();

operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ public NextAction apply(Packet packet) {
266266
String result = (String) packet.remove(ProcessingConstants.DOMAIN_INTROSPECTOR_LOG_RESULT);
267267
// Parse results into separate data files
268268
Map<String, String> data = parseIntrospectorResult(result, domain.getDomainUID());
269-
System.out.println("================");
270-
System.out.println(data.toString());
271-
System.out.println("================");
269+
LOGGER.fine("================");
270+
LOGGER.fine(data.toString());
271+
LOGGER.fine("================");
272272
String topologyYaml = data.get("topology.yaml");
273273
if (topologyYaml != null) {
274-
System.out.println("topology.yaml: " + topologyYaml);
274+
LOGGER.fine("topology.yaml: " + topologyYaml);
275275
DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
276276
WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
277277
ScanCache.INSTANCE.registerScan(
@@ -519,7 +519,7 @@ public static DomainTopology parseDomainTopologyYaml(String topologyYaml) {
519519
try {
520520
DomainTopology domainTopology = mapper.readValue(topologyYaml, DomainTopology.class);
521521

522-
System.out.println(
522+
LOGGER.fine(
523523
ReflectionToStringBuilder.toString(domainTopology, ToStringStyle.MULTI_LINE_STYLE));
524524

525525
return domainTopology;

operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,9 @@ public NextAction apply(Packet packet) {
127127
private static boolean runIntrospector(DomainPresenceInfo info) {
128128
Domain dom = info.getDomain();
129129
Scan scan = ScanCache.INSTANCE.lookupScan(dom.getMetadata().getNamespace(), dom.getDomainUID());
130-
System.out.println("++++++ JobHelper.runIntrospector scan: " + scan);
131-
System.out.println(
132-
"++++++ JobHelper.runIntrospector runningServersCount: " + runningServersCount(info));
133-
System.out.println(
134-
"++++++ JobHelper.runIntrospector creatingServers: " + creatingServers(info));
130+
LOGGER.fine("runIntrospector scan: " + scan);
131+
LOGGER.fine("runningServersCount: " + runningServersCount(info));
132+
LOGGER.fine("creatingServers: " + creatingServers(info));
135133
if (scan == null || (runningServersCount(info) == 0 && creatingServers(info))) {
136134
return true;
137135
}
@@ -142,6 +140,12 @@ private static int runningServersCount(DomainPresenceInfo info) {
142140
return ManagedServersUpStep.getRunningServers(info).size();
143141
}
144142

143+
/**
144+
* TODO: Enhance determination of when we believe we're creating WLS managed server pods
145+
*
146+
* @param info
147+
* @return
148+
*/
145149
private static boolean creatingServers(DomainPresenceInfo info) {
146150
Domain dom = info.getDomain();
147151
DomainSpec spec = dom.getSpec();
@@ -151,11 +155,7 @@ private static boolean creatingServers(DomainPresenceInfo info) {
151155
// Are we starting a cluster?
152156
for (Cluster cluster : clusters.values()) {
153157
int replicaCount = cluster.getReplicas();
154-
System.out.println(
155-
"+++++++ JobHelper.creatingServers replicaCount: "
156-
+ replicaCount
157-
+ " for cluster: "
158-
+ cluster);
158+
LOGGER.fine("creatingServers replicaCount: " + replicaCount + " for cluster: " + cluster);
159159
if (replicaCount > 0) {
160160
return true;
161161
}

0 commit comments

Comments
 (0)