edward/bunbun
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove libc and daemonize option

Browse source
This commit is contained in:
Edward Shen 2019-12-27 00:02:12 -05:00
parent 4bbdb2f45f
commit 03918ea53e
Signed by: edward
GPG key ID: F350507060ED6C90
4 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -390,7 +390,6 @@ dependencies = [
"handlebars 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "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)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",

1
Cargo.toml
View file

@ -17,7 +17,6 @@ handlebars = "2.0"
hotwatch = "0.4" hotwatch = "0.4"
percent-encoding = "2.1" percent-encoding = "2.1"
itertools = "0.8" itertools = "0.8"
libc = "0.2"
log = "0.4" log = "0.4"
simple_logger = "1.3" simple_logger = "1.3"
clap = { version = "2.33", features = ["yaml", "wrap_help"] } clap = { version = "2.33", features = ["yaml", "wrap_help"] }

4
src/cli.yaml
View file

@ -14,10 +14,6 @@ args:
multiple: true multiple: true
help: Decreases the log level to error or no logging at all, respectively. help: Decreases the log level to error or no logging at all, respectively.
conflicts_with: "verbose" conflicts_with: "verbose"
- daemon:
short: "d"
long: "daemon"
help: "Run bunbun as a daemon."
- config: - config:
short: "c" short: "c"
long: "config" long: "config"

13
src/main.rs
View file

@ -1,10 +1,8 @@
use actix_web::middleware::Logger; use actix_web::{middleware::Logger, App, HttpServer};
use actix_web::{App, HttpServer};
use clap::{crate_authors, crate_version, load_yaml, App as ClapApp}; use clap::{crate_authors, crate_version, load_yaml, App as ClapApp};
use error::BunBunError; use error::BunBunError;
use handlebars::Handlebars; use handlebars::Handlebars;
use hotwatch::{Event, Hotwatch}; use hotwatch::{Event, Hotwatch};
use libc::daemon;
use log::{debug, error, info, trace, warn}; use log::{debug, error, info, trace, warn};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cmp::min; use std::cmp::min;
@ -53,15 +51,6 @@ async fn main() -> Result<(), BunBunError> {
groups: conf.groups, 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)?; let _watch = start_watch(state.clone(), conf_file_location)?;
HttpServer::new(move || { HttpServer::new(move || {