Skip to content

Commit

Permalink
cleanup logging
Browse files Browse the repository at this point in the history
  • Loading branch information
@zspitzer
zspitzer committed Jul 3, 2024
1 parent ac7852b commit 45d6a11
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 89 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/bad-cfconfig.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ jobs:
luceeVersionQuery: ${{ matrix.luceeVersion }}
env:
LUCEE_BASE_CONFIG: ${{ github.workspace }}/custom/bad-cfconfig/.CFConfig-good.json5
SENTRY_DSN: http://localhost
SENTRY_ENV: testlab

- name: Copy .CFConfig-good.json5 into context
if: always()
Expand All @@ -65,9 +63,6 @@ jobs:
execute: /debug.cfm
luceeVersionQuery: ${{ matrix.luceeVersion }}
preCleanup: false
env:
SENTRY_DSN: http://localhost
SENTRY_ENV: testlab

- name: Check bad .CFConfig with unknown extension version LUCEE_BASE_CONFIG
uses: lucee/script-runner@main
Expand Down
38 changes: 10 additions & 28 deletions custom/bad-cfconfig/.CFConfig-bad-comment.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"deploy": {
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/deploy.log",
"level": "info",
"level": "trace",
"layout": "classic"
},
"thread": {
Expand All @@ -131,32 +131,17 @@
"level": "error",
"layout": "classic"
},
"update-provider": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"exception": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/exception.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"application": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/application.log",
"level": "info",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"scope": {
"appender": "resource",
Expand Down Expand Up @@ -201,13 +186,10 @@
"layout": "classic"
},
"rest": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/rest.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"mapping": {
"appender": "resource",
Expand Down
38 changes: 10 additions & 28 deletions custom/bad-cfconfig/.CFConfig-bad-extension.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"deploy": {
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/deploy.log",
"level": "info",
"level": "trace",
"layout": "classic"
},
"thread": {
Expand All @@ -131,32 +131,17 @@
"level": "error",
"layout": "classic"
},
"update-provider": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"exception": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/exception.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"application": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/application.log",
"level": "info",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"scope": {
"appender": "resource",
Expand Down Expand Up @@ -201,13 +186,10 @@
"layout": "classic"
},
"rest": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/rest.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"mapping": {
"appender": "resource",
Expand Down
38 changes: 10 additions & 28 deletions custom/bad-cfconfig/.CFConfig-good.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"deploy": {
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/deploy.log",
"level": "info",
"level": "trace",
"layout": "classic"
},
"thread": {
Expand All @@ -131,32 +131,17 @@
"level": "error",
"layout": "classic"
},
"update-provider": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
},
"exception": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/exception.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"application": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/application.log",
"level": "info",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"scope": {
"appender": "resource",
Expand Down Expand Up @@ -201,13 +186,10 @@
"layout": "classic"
},
"rest": {
"appenderArguments": "environment:%7Benv%2ESENTRY%5FENV%7D;dist:;extras:;dsn:%7Benv%2ESENTRY%5FDSN%7D;debug:true;tags",
"appender": "resource",
"appenderArguments": "path:{lucee-config}/logs/rest.log",
"level": "error",
"appenderClass": "org.lucee.extension.sentry.log.log4j.SentryAppenderLog4j2",
"appenderBundleName": "sentry.extension",
"appenderBundleVersion": "5.5.2.15",
"layoutClass": "lucee.commons.io.log.log4j2.layout.ClassicLayout",
"layoutArguments": ""
"layout": "classic"
},
"mapping": {
"appender": "resource",
Expand Down

0 comments on commit 45d6a11

Please sign in to comment.