Skip to content

Commit 46a51c8

Browse files
committed
manager mode should be set after parameter MANAGER_ADDRESS
1 parent 4ee01c7 commit 46a51c8

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

bin/ssmanager.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,6 @@ fn main() {
139139
config.local_addr = Some(bind_addr);
140140
}
141141

142-
// Overrides
143-
if matches.is_present("UDP_ONLY") {
144-
if let Some(ref mut m) = config.manager {
145-
m.mode = m.mode.merge(Mode::UdpOnly);
146-
}
147-
}
148-
149-
if matches.is_present("TCP_AND_UDP") {
150-
if let Some(ref mut m) = config.manager {
151-
m.mode = Mode::TcpAndUdp;
152-
}
153-
}
154-
155142
if matches.is_present("NO_DELAY") {
156143
config.no_delay = true;
157144
}
@@ -188,6 +175,19 @@ fn main() {
188175
}
189176
}
190177

178+
// Overrides
179+
if matches.is_present("UDP_ONLY") {
180+
if let Some(ref mut m) = config.manager {
181+
m.mode = m.mode.merge(Mode::UdpOnly);
182+
}
183+
}
184+
185+
if matches.is_present("TCP_AND_UDP") {
186+
if let Some(ref mut m) = config.manager {
187+
m.mode = Mode::TcpAndUdp;
188+
}
189+
}
190+
191191
if let Some(nofile) = matches.value_of("NOFILE") {
192192
config.nofile = Some(nofile.parse::<u64>().expect("an unsigned integer for `nofile`"));
193193
}

0 commit comments

Comments
 (0)