Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2024-11-22 13:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Simplify configuration management

Browse Source
This commit is contained in:
Pierre HUBERT 2021-10-16 17:18:40 +02:00
parent 9ff14a1fcf
commit ffc6778822
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/config.rs
View File

@ -35,7 +35,7 @@ pub struct IndependentPushService {
#[derive(Debug)] #[derive(Debug)]
pub struct Config { pub struct Config {
pub port: i32, pub port: u64,
pub listen_address: String, pub listen_address: String,
pub storage_url: String, pub storage_url: String,
pub storage_path: String, pub storage_path: String,
@ -59,10 +59,6 @@ pub struct Config {
static mut CONF: Option<Config> = None; static mut CONF: Option<Config> = None;
impl Config { impl Config {
fn yaml_i32(parsed: &Yaml, name: &str) -> i32 {
parsed[name].as_i64().expect(format!("{} is missing (int)", name).as_str()) as i32
}
fn yaml_u64(parsed: &Yaml, name: &str) -> u64 { fn yaml_u64(parsed: &Yaml, name: &str) -> u64 {
parsed[name].as_i64().expect(format!("{} is missing (int)", name).as_str()) as u64 parsed[name].as_i64().expect(format!("{} is missing (int)", name).as_str()) as u64
} }
@ -123,7 +119,7 @@ impl Config {
}; };
let conf = Config { let conf = Config {
port: Config::yaml_i32(parsed, "server-port") as i32, port: Config::yaml_u64(parsed, "server-port"),
listen_address: Config::yaml_str(parsed, "server-address"), listen_address: Config::yaml_str(parsed, "server-address"),
storage_url: Config::yaml_str(parsed, "storage-url"), storage_url: Config::yaml_str(parsed, "storage-url"),

4
src/helpers/database.rs
View File

@ -599,8 +599,8 @@ pub fn query<E, F: Fn(&RowResult) -> ProcessRowResult<E>>(info: QueryInfo, proce
/// Count the number of results a query would have produced /// Count the number of results a query would have produced
pub fn count(mut q: QueryInfo) -> ResultBoxError<usize> { pub fn count(mut q: QueryInfo) -> ResultBoxError<usize> {
&q.fields.clear(); q.fields.clear();
&q.fields.push("COUNT(*) as count".to_string()); q.fields.push("COUNT(*) as count".to_string());
query(q, |res| res.get_usize("count"))?.pop() query(q, |res| res.get_usize("count"))?.pop()
.ok_or(ExecError::boxed_new("database::count did not return a result!")) .ok_or(ExecError::boxed_new("database::count did not return a result!"))