Skip to content

Commit 9b78d95

Browse files
lmajanogithub-actions[bot]
lmajano
authored and
github-actions[bot]
committed
Apply cfformat changes
1 parent f4d0000 commit 9b78d95

File tree

4 files changed

+58
-59
lines changed

4 files changed

+58
-59
lines changed

‎system/logging/LogBox.cfc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ component accessors="true" {
179179
var rootConfig = variables.config.getRoot();
180180
// Create Root Logger
181181
var args = {
182-
category : "ROOT",
183-
levelMin : rootConfig.levelMin,
184-
levelMax : rootConfig.levelMax,
185-
appenders : getAppendersMap( rootConfig.appenders ),
182+
category : "ROOT",
183+
levelMin : rootConfig.levelMin,
184+
levelMax : rootConfig.levelMax,
185+
appenders : getAppendersMap( rootConfig.appenders ),
186186
serializeExtraInfo : variables.config.getSerializeExtraInfo()
187187
};
188188

@@ -248,20 +248,20 @@ component accessors="true" {
248248
var categoryConfig = variables.config.getCategory( arguments.category );
249249
// Setup creation arguments
250250
args = {
251-
category : categoryConfig.name,
252-
levelMin : categoryConfig.levelMin,
253-
levelMax : categoryConfig.levelMax,
254-
appenders : getAppendersMap( categoryConfig.appenders ),
251+
category : categoryConfig.name,
252+
levelMin : categoryConfig.levelMin,
253+
levelMax : categoryConfig.levelMax,
254+
appenders : getAppendersMap( categoryConfig.appenders ),
255255
serializeExtraInfo : variables.config.getSerializeExtraInfo()
256256
};
257257
} else {
258258
// Do Category Inheritance? or else just return the root logger.
259259
root = locateCategoryParentLogger( arguments.category );
260260
// Build it out as per Root logger
261261
args = {
262-
category : arguments.category,
263-
levelMin : root.getLevelMin(),
264-
levelMax : root.getLevelMax(),
262+
category : arguments.category,
263+
levelMin : root.getLevelMin(),
264+
levelMax : root.getLevelMax(),
265265
serializeExtraInfo : variables.config.getSerializeExtraInfo()
266266
};
267267
}

‎system/logging/LogEvent.cfc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ component accessors="true" {
4242
/**
4343
* Constructor
4444
*
45-
* @message The message to log.
46-
* @severity The severity level to log.
47-
* @extraInfo Extra information to send to the loggers.
48-
* @category The category to log this message under. By default it is blank.
45+
* @message The message to log.
46+
* @severity The severity level to log.
47+
* @extraInfo Extra information to send to the loggers.
48+
* @category The category to log this message under. By default it is blank.
4949
* @serializeExtraInfo Flag to allow serializing complex objects in `extraInfo`. Default is true.
5050
*/
5151
function init(
5252
required message,
5353
required severity,
54-
extraInfo = "",
55-
category = "",
54+
extraInfo = "",
55+
category = "",
5656
boolean serializeExtraInfo = true
5757
){
5858
// Init event

‎system/logging/Logger.cfc‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ component accessors="true" {
4545
/**
4646
* Constructor
4747
*
48-
* @category The category name to use this logger with
49-
* @levelMin The default log level for this appender, by default it is 0. Optional. ex: LogBox.logLevels.WARN
50-
* @levelMax The default log level for this appender, by default it is 0. Optional. ex: LogBox.logLevels.WARN
51-
* @appenders A struct of already created appenders for this category, or blank to use the root logger.
48+
* @category The category name to use this logger with
49+
* @levelMin The default log level for this appender, by default it is 0. Optional. ex: LogBox.logLevels.WARN
50+
* @levelMax The default log level for this appender, by default it is 0. Optional. ex: LogBox.logLevels.WARN
51+
* @appenders A struct of already created appenders for this category, or blank to use the root logger.
5252
* @serializeExtraInfo Flag to allow serializing complex objects in `extraInfo`. Default is true.
5353
*/
5454
function init(
5555
required category,
56-
numeric levelMin = 0,
57-
numeric levelMax = 4,
58-
struct appenders = {},
56+
numeric levelMin = 0,
57+
numeric levelMax = 4,
58+
struct appenders = {},
5959
boolean serializeExtraInfo = true
6060
){
6161
// Save Properties
62-
variables.rootLogger = "";
63-
variables.category = arguments.category;
64-
variables.appenders = arguments.appenders;
62+
variables.rootLogger = "";
63+
variables.category = arguments.category;
64+
variables.appenders = arguments.appenders;
6565
variables.serializeExtraInfo = arguments.serializeExtraInfo;
6666

6767
// Logger Logging Level defaults, which is wideeeee open!
@@ -327,15 +327,15 @@ component accessors="true" {
327327
/**
328328
* Write an entry into the loggers registered with this LogBox variables
329329
*
330-
* @message A message to log or a closure that returns a message to log
331-
* @severity The severity level to log, if invalid, it will default to **Info**
332-
* @extraInfo Extra information to send to appenders
330+
* @message A message to log or a closure that returns a message to log
331+
* @severity The severity level to log, if invalid, it will default to **Info**
332+
* @extraInfo Extra information to send to appenders
333333
* @serializeExtraInfo Flag to allow serializing complex objects in `extraInfo`. Default is the logger's setting.
334334
*/
335335
Logger function logMessage(
336336
required message,
337337
required severity,
338-
extraInfo = "",
338+
extraInfo = "",
339339
boolean serializeExtraInfo = variables.serializeExtraInfo
340340
){
341341
var target = this;
@@ -387,26 +387,25 @@ component accessors="true" {
387387
) {
388388
// Thread this puppy
389389
thread
390-
action ="run"
391-
name ="logMessage_#replace( createUUID(), "-", "", "all" )#"
392-
appenderName="#key#"
393-
message ="#arguments.message#"
394-
severity ="#arguments.severity#"
395-
extraInfo ="#arguments.extraInfo#"
396-
category ="#arguments.category#"
397-
serializeExtraInfo="#arguments.serializeExtraInfo#"
398-
{
399-
var target = this;
390+
action ="run"
391+
name ="logMessage_#replace( createUUID(), "-", "", "all" )#"
392+
appenderName ="#key#"
393+
message ="#arguments.message#"
394+
severity ="#arguments.severity#"
395+
extraInfo ="#arguments.extraInfo#"
396+
category ="#arguments.category#"
397+
serializeExtraInfo="#arguments.serializeExtraInfo#" {
398+
var target = this;
400399
if ( !hasAppenders() ) {
401400
target = getRootLogger();
402401
}
403402
var thisAppender = target.getAppender( attributes.appenderName );
404403
thread.logEvent = new coldbox.system.logging.LogEvent(
405-
message : attributes.message,
406-
severity : attributes.severity,
407-
extraInfo : attributes.extraInfo,
408-
category : attributes.category,
409-
serializeExtraInfo : attributes.serializeExtraInfo
404+
message : attributes.message,
405+
severity : attributes.severity,
406+
extraInfo : attributes.extraInfo,
407+
category : attributes.category,
408+
serializeExtraInfo: attributes.serializeExtraInfo
410409
);
411410
thisAppender.logMessage( thread.logEvent );
412411
}

‎tests/specs/logging/LoggerTest.cfc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
component extends="coldbox.system.testing.BaseModelTest" {
22

33
function run(){
4-
describe( "Logger", () =>{
5-
beforeEach( ( currentSpec ) =>{
4+
describe( "Logger", () => {
5+
beforeEach( ( currentSpec ) => {
66
setup();
77

88
mockLB = createMock( className = "coldbox.system.logging.LogBox", clearMethods = true );
@@ -15,11 +15,11 @@
1515
logger.setRootLogger( rootLogger );
1616
} );
1717

18-
it( "can create the logger", () =>{
18+
it( "can create the logger", () => {
1919
expect( logger ).toBeComponent();
2020
} );
2121

22-
it( "can verify all canX Methods", () =>{
22+
it( "can verify all canX Methods", () => {
2323
logger.setLevelMin( 0 );
2424
logger.setLevelMax( 3 );
2525

@@ -30,7 +30,7 @@
3030
assertFalse( logger.canDebug() );
3131
} );
3232

33-
it( "can verify all canX Methods with values", () =>{
33+
it( "can verify all canX Methods with values", () => {
3434
logger.setLevelMin( 0 );
3535
logger.setLevelMax( 3 );
3636

@@ -40,7 +40,7 @@
4040
assertFalse( logger.canLog( "asdfasfdsd" ) );
4141
} );
4242

43-
it( "can execute all logging methods", () =>{
43+
it( "can execute all logging methods", () => {
4444
// has appenders
4545
assertFalse( logger.hasAppenders() );
4646
// get appenders
@@ -67,7 +67,7 @@
6767
assertFalse( logger.hasAppenders() );
6868
} );
6969

70-
it( "can verify logging levels", () =>{
70+
it( "can verify logging levels", () => {
7171
logger.setLevelMin( 0 );
7272
logger.setLevelMax( 4 );
7373

@@ -97,8 +97,8 @@
9797
assertEquals( 1, arrayLen( newAppender.$callLog().logMessage ) );
9898
} );
9999

100-
describe( "can do logging with closures and automated canX inclusions", () =>{
101-
beforeEach( ( currentSpec ) =>{
100+
describe( "can do logging with closures and automated canX inclusions", () => {
101+
beforeEach( ( currentSpec ) => {
102102
// MockAppender
103103
mockAppender = createStub()
104104
.$( "getName", "MockAppender" )
@@ -109,20 +109,20 @@
109109
logger.addAppender( mockAppender );
110110
} );
111111

112-
it( "can log with a valid severity", () =>{
112+
it( "can log with a valid severity", () => {
113113
// Test closure in logger
114-
logger.logMessage( () =>{
114+
logger.logMessage( () => {
115115
return "This is a closure message";
116116
}, "info" );
117117
expect( mockAppender.$callLog().logMessage.first()[ "1" ].getMessage() ).toBe(
118118
"This is a closure message"
119119
);
120120
} );
121121

122-
it( "won't log with a non-loggable severity", () =>{
122+
it( "won't log with a non-loggable severity", () => {
123123
logger.setLevelMax( 1 );
124124
// Test closure in logger
125-
logger.logMessage( () =>{
125+
logger.logMessage( () => {
126126
return "This is a closure message";
127127
}, "debug" );
128128
expect( mockAppender.$callLog().logmessage ).toBeEmpty();

0 commit comments

Comments
 (0)