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
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
Commits
1f7d02ca
Commit
1f7d02ca
authored
5 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
[fix] core: revert regression introduce by commit
1fc6292c
parent
7c58d67e
No related branches found
No related tags found
1 merge request
!250
[fix] core: revert regression introduce by commit 1fc6292c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/core/core/src/router.rs
+11
-17
11 additions, 17 deletions
lib/core/core/src/router.rs
with
11 additions
and
17 deletions
lib/core/core/src/router.rs
+
11
−
17
View file @
1f7d02ca
...
@@ -215,8 +215,8 @@ fn start_broadcasting_thread(
...
@@ -215,8 +215,8 @@ fn start_broadcasting_thread(
RecvTimeoutError
::
Disconnected
=>
fatal_error!
(
"router thread disconnnected !"
),
RecvTimeoutError
::
Disconnected
=>
fatal_error!
(
"router thread disconnnected !"
),
},
},
}
}
if
let
Some
(
expected_regs_count
)
=
expected_registrations_count
{
if
(
expected_registrations_count
.is_none
()
if
registrations_count
<
expected_regs_count
||
registrations_count
<
unwrap
::
unwrap!
(
expected_reg
istration
s_count
))
&&
SystemTime
::
now
()
&&
SystemTime
::
now
()
.duration_since
(
start_time
)
.duration_since
(
start_time
)
.expect
(
"Duration error !"
)
.expect
(
"Duration error !"
)
...
@@ -226,13 +226,7 @@ fn start_broadcasting_thread(
...
@@ -226,13 +226,7 @@ fn start_broadcasting_thread(
fatal_error!
(
fatal_error!
(
"{} modules have registered, but expected {} !"
,
"{} modules have registered, but expected {} !"
,
registrations_count
,
registrations_count
,
expected_regs_count
expected_registrations_count
.unwrap_or
(
0
)
);
}
}
else
{
fatal_error!
(
"{} modules have registered, but none expected !"
,
registrations_count
);
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment