chiark
/
gitweb
/
~ian
/
hippotat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b042de2
)
config: Actually get global config
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Aug 2021 00:14:57 +0000
(
01:14
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Aug 2021 00:14:57 +0000
(
01:14
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/bin/server.rs
patch
|
blob
|
history
diff --git
a/src/bin/server.rs
b/src/bin/server.rs
index 72fc2dc7830cd03c13abacaf429282e6887b0ed5..6bc1df7e92e6ba3d7bcb88dff64470200c20adeb 100644
(file)
--- a/
src/bin/server.rs
+++ b/
src/bin/server.rs
@@
-16,10
+16,10
@@
pub struct Opts {
#[tokio::main]
async fn main() {
let opts = Opts::from_args();
- let
ics
= config::startup("hippotatd", LinkEnd::Server,
+ let
(ics,)
= config::startup("hippotatd", LinkEnd::Server,
&opts.config, &opts.log);
-
+ let global = config::InstanceConfigGlobal::from(&ics);
- dbg!(ics);
+ dbg!(ics
, global
);
}