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
23 changes: 6 additions & 17 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ derive_deref = "1.0.0"
reqwest = "0.9.1"
tempdir = "0.3.7"
parking_lot = "0.7.1"
jemallocator = { version = "0.1.8", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
jemalloc-ctl = "0.2.0"
jemallocator = { version = "0.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling', "background_threads"] }

lettre = "0.9"
lettre_email = "0.9"
Expand Down
3 changes: 0 additions & 3 deletions src/bin/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use std::{
use civet::Server as CivetServer;
use conduit_hyper::Service as HyperService;
use futures::Future;
use jemalloc_ctl;
use reqwest::Client;

enum Server {
Expand All @@ -22,8 +21,6 @@ enum Server {
use Server::*;

fn main() {
let _ = jemalloc_ctl::set_background_thread(true);

// Initialize logging
env_logger::init();

Expand Down