Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
jclausen committed Nov 22, 2023
2 parents aa06dde + c543ef7 commit 071e308
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name":"Elasticsearch for the Coldbox Framework",
"author":"Ortus Solutions <[email protected]",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbelasticsearch/@build.version@/[email protected]@[email protected]@.zip",
"version":"3.2.3",
"version":"3.2.4",
"slug":"cbelasticsearch",
"type":"modules",
"homepage":"https://cbelasticsearch.ortusbooks.com",
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

----
## [3.2.4] - 11-21-2023
## Fixed
* Added workaround for async manager usage in Linux environments
* Fixed Logstash appender error fallback Logbox reference

## [3.2.3] - 11-19-2023
## Changed
* Additional mapping enhancments for searchability
Expand Down
14 changes: 7 additions & 7 deletions models/logging/LogstashAppender.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ component
try {
var document = newDocument().new( index = getProperty( "dataStream" ), properties = logObj );
if( getProperty( "async" ) ){
variables.asyncManager.all( () => document.create() );
variables.asyncManager.newFuture().run( () => document.create() );
} else {
document.create();
}
Expand All @@ -164,16 +164,16 @@ component
extraInfo = { "logData" : logObj, "exception" : e },
category = e.type
);
var appendersMap = application.wirebox.getLogbox().getAppendersMap();
var appendersMap = application.wirebox.getLogbox().getAppenderRegistry();
// Log errors out to other appenders besides this one
var safeAppenders = appendersMap
appendersMap
.keyArray()
.filter( function( key ){
return key != getName();
return lcase( key ) != lcase( getName() );
} )
.each( function( appenderName ){
appendersMap[ appenderName ].logMessage( eLogEvent );
} );
saveAppenders.each( function( appenderName ){
appendersMap[ appenderName ].logMessage( eLogEvent );
} );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test-harness/box.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private":true,
"description":"",
"dependencies":{
"coldbox":"be"
"coldbox":"^7.2"
},
"devDependencies":{
"testbox":"*",
Expand Down

0 comments on commit 071e308

Please sign in to comment.