Skip to content

build(deps): bump android_logger from 0.11.3 to 0.13.1 #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikBjare merged 2 commits into from
Mar 23, 2023
Merged

build(deps): bump android_logger from 0.11.3 to 0.13.1 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52a8ad7
build(deps): bump android_logger from 0.11.3 to 0.13.1
dependabot[bot] Mar 23, 2023
c2ab74a
fix: fixed renamed method in updated android_logger
ErikBjare Mar 23, 2023
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
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion aw-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ jemallocator = "0.5.0"
[target.'cfg(target_os="android")'.dependencies]
jni = { version = "0.20", default-features = false }
libc = "0.2"
android_logger = "0.11"
android_logger = "0.13"
openssl-sys = { version = "0.9.82", features = ["vendored"]}
6 changes: 2 additions & 4 deletions aw-server/src/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ extern crate android_logger;

use std::ffi::{CStr, CString};
use std::os::raw::c_char;
use std::sync::Mutex;

use crate::device_id;
use crate::dirs;

use android_logger::Config;
use log::Level;
use rocket::serde::json::json;

#[no_mangle]
Expand Down Expand Up @@ -96,7 +94,7 @@ pub mod android {
}

unsafe fn create_error_object(env: &JNIEnv, msg: String) -> jstring {
let mut obj = json!({ "error": &msg });
let obj = json!({ "error": &msg });
string_to_jstring(&env, obj.to_string())
}

Expand Down Expand Up @@ -155,7 +153,7 @@ pub mod android {
if !INITIALIZED {
android_logger::init_once(
Config::default()
.with_min_level(Level::Info) // limit log level
.with_max_level(log::LevelFilter::Info) // limit log level
.with_tag("aw-server-rust"), // logs will show under mytag tag
//.with_filter( // configure messages for specific crate
// FilterBuilder::new()
Expand Down