Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 101 additions & 9 deletions packages/cubejs-backend-native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/cubejs-backend-native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ serde_json = "1.0.127"
simple_logger = "1.7.0"
tokio = { version = "1", features = ["full", "rt"] }
uuid = { version = "1", features = ["v4"] }
log_nonblock = { version = "0.1.6", optional = true }

[dependencies.neon]
version = "=1"
default-features = false
features = ["napi-1", "napi-4", "napi-6", "futures"]

[features]
default = ["neon-entrypoint"]
default = ["neon-entrypoint", "async-log"]
neon-debug = []
neon-entrypoint = []
python = ["pyo3", "pyo3-asyncio"]
async-log = ["log_nonblock"]
2 changes: 1 addition & 1 deletion packages/cubejs-backend-native/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl NodeCubeServices {

futures.push(tokio::spawn(async move {
if let Err(e) = gateway_server.processing_loop().await {
log::error!("{}", e.to_string());
log::error!("{}", e);
};

Ok(())
Expand Down
26 changes: 24 additions & 2 deletions packages/cubejs-backend-native/src/node_export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ use std::sync::Arc;

use cubesql::telemetry::LocalReporter;
use cubesql::{telemetry::ReportingLogger, CubeError};
#[cfg(feature = "async-log")]
use log_nonblock::NonBlockingLoggerBuilder;
use neon::prelude::*;
use neon::result::Throw;
#[cfg(not(feature = "async-log"))]
use simple_logger::SimpleLogger;

pub(crate) struct SQLInterface {
Expand Down Expand Up @@ -578,15 +581,34 @@ pub fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
Ok(cx.undefined())
}

pub fn create_logger(log_level: log::Level) -> SimpleLogger {
SimpleLogger::new()
#[cfg(not(feature = "async-log"))]
pub fn create_logger(log_level: log::Level) -> Box<dyn log::Log> {
let logger = SimpleLogger::new()
.with_level(log::Level::Error.to_level_filter())
.with_module_level("cubesql", log_level.to_level_filter())
.with_module_level("cube_xmla", log_level.to_level_filter())
.with_module_level("cube_xmla_engine", log_level.to_level_filter())
.with_module_level("cubejs_native", log_level.to_level_filter())
.with_module_level("datafusion", log::Level::Warn.to_level_filter())
.with_module_level("pg_srv", log::Level::Warn.to_level_filter());

Box::new(logger)
}

#[cfg(feature = "async-log")]
pub fn create_logger(log_level: log::Level) -> Box<dyn log::Log> {
let logger = NonBlockingLoggerBuilder::new()
.with_level(log::Level::Error.to_level_filter())
.with_module_level("cubesql", log_level.to_level_filter())
.with_module_level("cube_xmla", log_level.to_level_filter())
.with_module_level("cube_xmla_engine", log_level.to_level_filter())
.with_module_level("cubejs_native", log_level.to_level_filter())
.with_module_level("datafusion", log::Level::Warn.to_level_filter())
.with_module_level("pg_srv", log::Level::Warn.to_level_filter())
.build()
.unwrap();

Box::new(logger)
}

pub fn setup_local_logger(log_level: log::Level) {
Expand Down
Loading