Skip to content
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.

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

dev #29

Merged
merged 2 commits into from
Mar 22, 2024
Merged

dev #29

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
27 changes: 14 additions & 13 deletions .zetch.lock

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

6 changes: 3 additions & 3 deletions js/bitbazaar/color/steppedScale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ export const createSteppedScale = ({
// Try up to 5 times to produce values that don't end in white or black (i.e. the step size too large)
const numAttempts = 5;
for (let attempt = 1; attempt <= numAttempts; attempt++) {
// Reset steps for new attempt:
steps.length = 0;

// Reduce the step size each attempt, to try and get a scale that doesn't hit white or black:
const stepSize = 0.5 * (1 / attempt);
let failed = false;
Expand Down Expand Up @@ -61,9 +64,6 @@ export const createSteppedScale = ({
if (!failed) {
break;
}

// Reset steps to try again:
steps.length = 0;
}

return steps;
Expand Down
2 changes: 1 addition & 1 deletion opencollector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ exporters:
stream-name: default
# Writes all opentelemetry logs, traces, metrics to a file, useful for testing:
file/debug_file_writing:
path: /home/runner/work/bitbazaar/bitbazaar/logs/otlp_telemetry_out.log
path: /Users/zak/z/code/bitbazaar/logs/otlp_telemetry_out.log
rotation:
max_megabytes: 10
max_days: 3
Expand Down
107 changes: 0 additions & 107 deletions rust/Cargo.lock

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

4 changes: 0 additions & 4 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ all-features = true

[features]
log-filter = ["dep:regex"]
clap = ["dep:clap"]
timing = ['dep:comfy-table', 'dep:chrono']
cli = ['dep:normpath', 'dep:conch-parser', 'dep:homedir', 'dep:chrono', 'dep:strum']
redis = ['dep:deadpool-redis', 'dep:redis', 'dep:sha1_smol', 'dep:serde_json']
Expand Down Expand Up @@ -70,9 +69,6 @@ serde_json = { version = "1.0", optional = true }
# FEAT: log-filter:
regex = { version = '1', optional = true }

# FEAT: clap:
clap = { version = "4.4", features = ["derive", "string"], optional = true }

# FEAT: timing:
comfy-table = { version = "7.1", optional = true }

Expand Down
45 changes: 0 additions & 45 deletions rust/bitbazaar/log/clap_log_level_args.rs

This file was deleted.

4 changes: 0 additions & 4 deletions rust/bitbazaar/log/mod.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#[cfg(feature = "clap")]
mod clap_log_level_args;
#[cfg(test)]
mod diff_file_log;
mod global_log;
mod macros;
#[cfg(any(feature = "opentelemetry-grpc", feature = "opentelemetry-http"))]
mod ot_tracing_bridge;

#[cfg(feature = "clap")]
pub use clap_log_level_args::ClapLogLevelArgs;
pub use global_log::{global_fns::*, GlobalLog, GlobalLogBuilder};

#[cfg(test)]
Expand Down
Loading