From 03918ea53e0188478360c6173e9c45ba61245714 Mon Sep 17 00:00:00 2001 From: Edward Shen Date: Fri, 27 Dec 2019 00:02:12 -0500 Subject: [PATCH] remove libc and daemonize option --- Cargo.lock | 1 - Cargo.toml | 1 - src/cli.yaml | 4 ---- src/main.rs | 13 +------------ 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b480cca..207e44c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,7 +390,6 @@ dependencies = [ "handlebars 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "hotwatch 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 4439aa4..885b928 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ handlebars = "2.0" hotwatch = "0.4" percent-encoding = "2.1" itertools = "0.8" -libc = "0.2" log = "0.4" simple_logger = "1.3" clap = { version = "2.33", features = ["yaml", "wrap_help"] } diff --git a/src/cli.yaml b/src/cli.yaml index d564492..853be3f 100644 --- a/src/cli.yaml +++ b/src/cli.yaml @@ -14,10 +14,6 @@ args: multiple: true help: Decreases the log level to error or no logging at all, respectively. conflicts_with: "verbose" - - daemon: - short: "d" - long: "daemon" - help: "Run bunbun as a daemon." - config: short: "c" long: "config" diff --git a/src/main.rs b/src/main.rs index fb52431..caf4fc2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,8 @@ -use actix_web::middleware::Logger; -use actix_web::{App, HttpServer}; +use actix_web::{middleware::Logger, App, HttpServer}; use clap::{crate_authors, crate_version, load_yaml, App as ClapApp}; use error::BunBunError; use handlebars::Handlebars; use hotwatch::{Event, Hotwatch}; -use libc::daemon; use log::{debug, error, info, trace, warn}; use serde::{Deserialize, Serialize}; use std::cmp::min; @@ -53,15 +51,6 @@ async fn main() -> Result<(), BunBunError> { groups: conf.groups, })); - // Daemonize after trying to read from config and before watching; allow user - // to see a bad config (daemon process sets std{in,out} to /dev/null) - if matches.is_present("daemon") { - unsafe { - debug!("Daemon flag provided. Running as a daemon."); - daemon(0, 0); - } - } - let _watch = start_watch(state.clone(), conf_file_location)?; HttpServer::new(move || {