Skip to content

Commit e792f22

Browse files
CarolynRountreeCarolynRountree
authored
Jira#wdt 319 reduce number validate messages (#645)
* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator * Validator should log fewer messages when run as tool
1 parent 51f9044 commit e792f22

File tree

6 files changed

+60
-18
lines changed

6 files changed

+60
-18
lines changed

‎core/src/main/java/oracle/weblogic/deploy/json/AbstractJsonTranslator.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ protected PyDictionary parseInternal(String jsonFileName, InputStream jsonStream
294294
final String METHOD = "parseInternal";
295295

296296
PyDictionary result = null;
297-
getLogger().entering(getClassName(), METHOD, jsonFileName, jsonStream);
298297
if (jsonStream != null) {
299298
JsonErrorListener errorListener = new JsonErrorListener(jsonFileName, false);
300299
try {
@@ -328,7 +327,6 @@ protected PyDictionary parseInternal(String jsonFileName, InputStream jsonStream
328327
}
329328
result = fileDict;
330329
}
331-
getLogger().exiting(getClassName(), METHOD);
332330
return result;
333331
}
334332

‎core/src/main/java/oracle/weblogic/deploy/json/JsonStreamTranslator.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.json;
@@ -56,7 +56,6 @@ public JsonStreamTranslator(String streamFileName, InputStream jsonStream, boole
5656
public PyDictionary parse() throws JsonException {
5757
final String METHOD = "parse";
5858

59-
LOGGER.entering(CLASS, METHOD);
6059
PyDictionary result = null;
6160
if (jsonStream != null) {
6261
try {
@@ -70,7 +69,6 @@ public PyDictionary parse() throws JsonException {
7069
jsonStream = null;
7170
}
7271
}
73-
LOGGER.exiting(CLASS, METHOD);
7472
return result;
7573
}
7674

‎core/src/main/python/wlsdeploy/logging/platform_logger.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def config(self, message, *args, **kwargs):
116116
method = kwargs.pop('method_name', None)
117117
clazz = kwargs.pop('class_name', None)
118118
error = kwargs.pop('error', None)
119-
record = self.__get_log_record(JLevel.CONFIG, clazz, method, message, error, *args)
119+
record = self._get_log_record(JLevel.CONFIG, clazz, method, message, error, *args)
120120
self.logger.log(record)
121121
return
122122

@@ -131,7 +131,7 @@ def log(self, level, message, *args, **kwargs):
131131
method = kwargs.pop('method_name', None)
132132
clazz = kwargs.pop('class_name', None)
133133
error = kwargs.pop('error', None)
134-
record = self.__get_log_record(level, clazz, method, message, error, *args)
134+
record = self._get_log_record(level, clazz, method, message, error, *args)
135135
self.logger.log(record)
136136
return
137137

@@ -169,7 +169,7 @@ def fine(self, message, *args, **kwargs):
169169
method = kwargs.pop('method_name', None)
170170
clazz = kwargs.pop('class_name', None)
171171
error = kwargs.pop('error', None)
172-
record = self.__get_log_record(JLevel.FINE, clazz, method, message, error, *args)
172+
record = self._get_log_record(JLevel.FINE, clazz, method, message, error, *args)
173173
self.logger.log(record)
174174
return
175175

@@ -183,7 +183,7 @@ def finer(self, message, *args, **kwargs):
183183
method = kwargs.pop('method_name', None)
184184
clazz = kwargs.pop('class_name', None)
185185
error = kwargs.pop('error', None)
186-
record = self.__get_log_record(JLevel.FINER, clazz, method, message, error, *args)
186+
record = self._get_log_record(JLevel.FINER, clazz, method, message, error, *args)
187187
self.logger.log(record)
188188
return
189189

@@ -197,7 +197,7 @@ def finest(self, message, *args, **kwargs):
197197
method = kwargs.pop('method_name', None)
198198
clazz = kwargs.pop('class_name', None)
199199
error = kwargs.pop('error', None)
200-
record = self.__get_log_record(JLevel.FINEST, clazz, method, message, error, *args)
200+
record = self._get_log_record(JLevel.FINEST, clazz, method, message, error, *args)
201201
self.logger.log(record)
202202
return
203203

@@ -211,7 +211,7 @@ def info(self, message, *args, **kwargs):
211211
method = kwargs.pop('method_name', None)
212212
clazz = kwargs.pop('class_name', None)
213213
error = kwargs.pop('error', None)
214-
record = self.__get_log_record(JLevel.INFO, clazz, method, message, error, *args)
214+
record = self._get_log_record(JLevel.INFO, clazz, method, message, error, *args)
215215
self.logger.log(record)
216216
return
217217

@@ -225,7 +225,7 @@ def warning(self, message, *args, **kwargs):
225225
method = kwargs.pop('method_name', None)
226226
clazz = kwargs.pop('class_name', None)
227227
error = kwargs.pop('error', None)
228-
record = self.__get_log_record(JLevel.WARNING, clazz, method, message, error, *args)
228+
record = self._get_log_record(JLevel.WARNING, clazz, method, message, error, *args)
229229
self.logger.log(record)
230230
return
231231

@@ -239,7 +239,7 @@ def severe(self, message, *args, **kwargs):
239239
method = kwargs.pop('method_name', None)
240240
clazz = kwargs.pop('class_name', None)
241241
error = kwargs.pop('error', None)
242-
record = self.__get_log_record(JLevel.SEVERE, clazz, method, message, error, *args)
242+
record = self._get_log_record(JLevel.SEVERE, clazz, method, message, error, *args)
243243
self.logger.log(record)
244244
return
245245

@@ -256,7 +256,7 @@ def throwing(self, error, method_name=None, class_name=None):
256256
self.logger.throwing(error)
257257
return
258258

259-
def __get_log_record(self, level, clazz, method, message, error, *args):
259+
def _get_log_record(self, level, clazz, method, message, error, *args):
260260
record = JLogRecord(level, message)
261261
record.setLoggerName(self.name)
262262
record.setMillis(JSystem.currentTimeMillis())

‎core/src/main/python/wlsdeploy/tool/validate/validator.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
from wlsdeploy.aliases.wlst_modes import WlstModes
1919
from wlsdeploy.exception.expection_types import ExceptionType
2020
from wlsdeploy.exception import exception_helper
21-
from wlsdeploy.logging.platform_logger import PlatformLogger
2221
from wlsdeploy.tool.create import wlsroles_helper
2322
from wlsdeploy.tool.util.alias_helper import AliasHelper
2423
from wlsdeploy.tool.util.archive_helper import ArchiveHelper
2524
from wlsdeploy.tool.validate import validation_utils
25+
from wlsdeploy.tool.validate.validator_logger import ValidatorLogger
2626
from wlsdeploy.util import dictionary_utils
2727
from wlsdeploy.util import model
2828
from wlsdeploy.util import variables
@@ -40,7 +40,7 @@
4040
from wlsdeploy.aliases.model_constants import WLS_ROLES
4141

4242
_class_name = 'Validator'
43-
_logger = PlatformLogger('wlsdeploy.validate')
43+
_logger = ValidatorLogger('wlsdeploy.validate')
4444
_ModelNodeTypes = Enum(['FOLDER_TYPE', 'NAME_TYPE', 'ATTRIBUTE', 'ARTIFICIAL_TYPE'])
4545
_ValidationModes = Enum(['STANDALONE', 'TOOL'])
4646
_ROOT_LEVEL_VALIDATION_AREA = validation_utils.format_message('WLSDPLY-05000')
@@ -114,14 +114,18 @@ def validate_in_standalone_mode(self, model_dict, variable_map, archive_file_nam
114114
"""
115115
_method_name = 'validate_in_standalone_mode'
116116

117+
# If standalone, log file will not be passed, so get a new logger with correct mode type
118+
self._validation_mode = _ValidationModes.STANDALONE
119+
self._logger = ValidatorLogger(self._logger.get_name(), _ValidationModes.from_value(self._validation_mode))
120+
self._logger.entering(archive_file_name, class_name=_class_name, method_name=_method_name)
121+
117122
# We need to make a deep copy of model_dict here, to ensure it's
118123
# treated as a "read-only'" reference variable, during the variable
119124
# file validation process. The variable file validation process could
120125
# actually require changes to be made to the cloned model dictionary
121126
cloned_model_dict = copy.deepcopy(model_dict)
122127

123128
self._logger.entering(archive_file_name, class_name=_class_name, method_name=_method_name)
124-
self._validation_mode = _ValidationModes.STANDALONE
125129
self.__validate_model_file(cloned_model_dict, variable_map, archive_file_name)
126130

127131
self._logger.exiting(class_name=_class_name, method_name=_method_name)
@@ -887,7 +891,7 @@ def __validate_wlsroles_section(self, attribute_value):
887891
wlsroles_validator = wlsroles_helper.validator(attribute_value, self._logger)
888892
wlsroles_validator.validate_roles()
889893

890-
self._logger.exiting( class_name=_class_name, method_name=__method_name)
894+
self._logger.exiting(class_name=_class_name, method_name=__method_name)
891895

892896
def _report_unsupported_variable_usage(self, tokenized_value, model_folder_path):
893897
_method_name = '_report_unsupported_variable_usage'

‎core/src/main/python/wlsdeploy/tool/validate/validator_logger.py‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
"""
2+
Copyright (c) 2020, Oracle Corporation and/or its affiliates.
3+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
"""
5+
import java.util.logging.Level as Level
6+
7+
from wlsdeploy.logging.platform_logger import PlatformLogger
8+
from wlsdeploy.util.enum import Enum
9+
10+
STANDALONE = 'STANDALONE'
11+
TOOL = 'TOOL'
12+
13+
14+
class ValidatorLogger(PlatformLogger):
15+
16+
def __init__(self, logger_name, mode_type=TOOL,
17+
resource_bundle_name='oracle.weblogic.deploy.messages.wlsdeploy_rb'):
18+
PlatformLogger.__init__(self, logger_name, resource_bundle_name)
19+
self._mode_type = mode_type
20+
# The logger properties is set to level FINE, which is for tool mode. Reset that to FINER for
21+
# standalone mode. This will of course not help the standalone user that wants FINE level
22+
# but the logs are for WDT troubleshooting.
23+
if self.get_level() == Level.FINE and self._mode_type == STANDALONE:
24+
self.set_level(Level.FINER)
25+
26+
def info(self, message, *args, **kwargs):
27+
"""
28+
Log an info-level message.
29+
:param message: the message key
30+
:param args: the arguments to use to populate the message placeholders
31+
:param kwargs: the keyword arguments
32+
"""
33+
method = kwargs.pop('method_name', None)
34+
clazz = kwargs.pop('class_name', None)
35+
error = kwargs.pop('error', None)
36+
level = Level.INFO
37+
if self._mode_type == TOOL:
38+
level = Level.FINE
39+
record = self._get_log_record(level, clazz, method, message, error, *args)
40+
self.logger.log(record)
41+
return

‎installer/src/main/etc/logging.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ wlsdeploy.create.level=FINER
77
wlsdeploy.deploy.level=FINER
88
wlsdeploy.discover.level=FINER
99
wlsdeploy.update.level=FINER
10+
wlsdeploy.validate.level=FINE
1011

1112
wlsdeploy.aliases.level=FINE
1213
wlsdeploy.mbean.utils.level=FINE

0 commit comments

Comments
 (0)