Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Dunitrust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
nodes
rust
Dunitrust
Merge requests
!250
[fix] core: revert regression introduce by commit
1fc6292c
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
[fix] core: revert regression introduce by commit
1fc6292c
elois/urgent-fix
into
dev
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Éloïs
requested to merge
elois/urgent-fix
into
dev
5 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
0
0
Merge request reports
Viewing commit
1f7d02ca
Show latest version
1 file
+
11
−
17
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
1f7d02ca
[fix] core: revert regression introduce by commit
1fc6292c
· 1f7d02ca
Éloïs
authored
5 years ago
lib/core/core/src/router.rs
+
11
−
17
View file @ 1f7d02ca
Edit in single-file editor
Open in Web IDE
Show full file
@@ -215,24 +215,18 @@ fn start_broadcasting_thread(
RecvTimeoutError
::
Disconnected
=>
fatal_error!
(
"router thread disconnnected !"
),
},
}
if
let
Some
(
expected_regs_count
)
=
expected_registrations_count
{
if
registrations_count
<
expected_regs_count
&&
SystemTime
::
now
()
.duration_since
(
start_time
)
.expect
(
"Duration error !"
)
.as_secs
()
>
*
MAX_REGISTRATION_DELAY
{
fatal_error!
(
"{} modules have registered, but expected {} !"
,
registrations_count
,
expected_regs_count
);
}
}
else
{
if
(
expected_registrations_count
.is_none
()
||
registrations_count
<
unwrap
::
unwrap!
(
expected_registrations_count
))
&&
SystemTime
::
now
()
.duration_since
(
start_time
)
.expect
(
"Duration error !"
)
.as_secs
()
>
*
MAX_REGISTRATION_DELAY
{
fatal_error!
(
"{} modules have registered, but none expected !"
,
registrations_count
"{} modules have registered, but expected {} !"
,
registrations_count
,
expected_registrations_count
.unwrap_or
(
0
)
);
}
}
Loading