Skip to content

Commit 49ef027

Browse files
committed
Merge branch 'development'
2 parents 18ec4d8 + c478527 commit 49ef027

File tree

6 files changed

+34
-12
lines changed

6 files changed

+34
-12
lines changed

box.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"private":false,
66
"defaultPort":0,
77
"dependencies":{
8-
"coldbox":"4.1.0+00002"
8+
"coldbox":"be"
99
},
1010
"devDependencies":{
1111
"testbox":"2.3.0+00044"
1212
},
1313
"installPaths":{
14-
"coldbox":"coldbox",
15-
"testbox":"testbox"
14+
"testbox":"testbox",
15+
"coldbox":"coldbox"
1616
}
1717
}

modules/cbdebugger/changelog.md renamed to changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
CHANGELOG
22
=========
33

4+
## 1.4.0
5+
# ColdBox Tracer Appender added by Default by Eric Peterson
6+
47
## 1.3.0
58
* Travis integration
69
* DocBox update

modules/cbdebugger/ModuleConfig.cfc

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ component {
77

88
// Module Properties
99
this.title = "ColdBox Debugger";
10-
this.author = "Curt Gratz";
10+
this.author = "Curt Gratz - Ortus Solutions";
1111
this.webURL = "http://www.ortussolutions.com";
1212
this.description = "The ColdBox Debugger Module";
1313
this.version = "@version.number@[email protected]@";
@@ -114,4 +114,21 @@ component {
114114
// incorporate settings
115115
structAppend( configStruct.debugger, debuggerDSL, true );
116116
}
117+
118+
// This appender is part of a module, so we need to register it after the modules have been loaded.
119+
function afterConfigurationLoad() {
120+
var logBox = controller.getLogBox();
121+
// Only 4.3
122+
if( !findNoCase( "4.3", controller.getSetting( "version", true ) ) ){
123+
return;
124+
}
125+
logBox.registerAppender( 'tracer', 'cbdebugger.includes.appenders.ColdBoxTracerAppender' );
126+
var appenders = logBox.getAppendersMap( 'tracer' );
127+
// Register the appender with the root loggger, and turn the logger on.
128+
var root = logBox.getRootLogger();
129+
root.addAppender( appenders[ 'tracer' ] );
130+
root.setLevelMax( 4 );
131+
root.setLevelMin( 0 );
132+
133+
}
117134
}

modules/cbdebugger/box.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
{
22
"name" : "ColdBox Debugger",
33
"author" : "Ortus Solutions <[email protected]",
4+
"location" : "http://downloads.ortussolutions.com.s3.amazonaws.com/ortussolutions/coldbox-modules/cbdebugger/@version.number@/[email protected]@.zip",
45
"version" : "@version.number@[email protected]@",
56
"slug" : "cbdebugger",
67
"type" : "modules",
7-
"homepage" : "https://github.com/ColdBox/cbox-debugger",
8-
"documentation" : "https://github.com/ColdBox/cbox-debugger",
9-
"repository" : { "type" : "git", "url" : "https://github.com/ColdBox/cbox-debugger" },
8+
"homepage" : "https://github.com/coldbox-modules/cbox-debugger",
9+
"bugs" : "https://github.com/coldbox-modules/cbox-debugger/issues",
10+
"documentation" : "https://github.com/coldbox-modules/cbox-debugger",
11+
"repository" : { "type" : "git", "url" : "https://github.com/coldbox-modules/cbox-debugger" },
1012
"shortDescription" : "The official ColdBox 4 debugger module",
1113
"license" : [
1214
{ "type" : "Apache2", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" }
1315
],
1416
"contributors" : [
1517
"Curt Gratz <[email protected]", "Brad Wood <[email protected]>", "Luis Majano <[email protected]>"
1618
],
17-
"engines" : [
18-
{ "type" : "lucee", "version" : ">4.5" },
19-
{ "type" : "adobe", "version" : ">9.02" }
20-
],
2119
"ignore":[
2220
"**/.*",
2321
"tests",

readme.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Build Status](https://travis-ci.org/ColdBox/cbox-debugger.svg?branch=master)](https://travis-ci.org/ColdBox/cbox-debugger)
2+
13
#WELCOME TO THE COLDBOX DEBUGGER MODULE
24
This module will enhance your application with debugger capabilities, a nice debugging panel and much more to make your ColdBox application development nicer, funer and greater! Yes, funer is a word!
35

@@ -7,6 +9,7 @@ Apache License, Version 2.0.
79
##IMPORTANT LINKS
810
- https://github.com/ColdBox/cbox-debugger
911
- http://www.coldbox.org/forgebox/view/cbdebugger
12+
- [Changelog](changelog.md)
1013

1114
##SYSTEM REQUIREMENTS
1215
- Lucee 4.5+

workbench/build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
44
<property name="project.name" value="cbdebugger" />
55
<property name="module.name" value="cbdebugger" />
6-
<property name="project.version" value="1.3.0"/>
6+
<property name="project.version" value="1.4.0"/>
77
<property name="groupID" value="ortussolutions" />
88

99
<!-- Build Labels -->
@@ -69,6 +69,7 @@
6969
</copy>
7070
<!-- Copy readme -->
7171
<copy todir="${dir.build}" encoding="UTF-8" file="readme.md" overwrite="true" />
72+
<copy todir="${dir.build}" encoding="UTF-8" file="changelog.md" overwrite="true" />
7273

7374
<!-- Replace Version + Build Numbers -->
7475
<replaceregexp match='@version.number@' replace="${project.version}" flags="ig" byline="true" encoding="UTF-8">

0 commit comments

Comments
 (0)