Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
duniter-ui
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
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
Show more breadcrumbs
nodes
typescript
modules
duniter-ui
Commits
311e5c57
Commit
311e5c57
authored
8 years ago
by
Cédric Moreau
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Webmin adaptation to the new "module" architecture
parent
101a5234
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/controller/webmin.js
+6
-3
6 additions, 3 deletions
server/controller/webmin.js
with
6 additions
and
3 deletions
server/controller/webmin.js
+
6
−
3
View file @
311e5c57
...
@@ -46,9 +46,9 @@ function WebAdmin (duniterServer) {
...
@@ -46,9 +46,9 @@ function WebAdmin (duniterServer) {
let
startServicesP
,
stopServicesP
;
let
startServicesP
,
stopServicesP
;
let
pluggedConfP
=
plugForConf
();
let
pluggedConfP
=
Promise
.
resolve
();
// Initially, the node is already plugged in
let
pluggedDALP
=
replugDAL
();
let
pluggedDALP
=
Promise
.
resolve
();
// Initially, the node is already plugged in
this
.
pushEntity
=
(
req
,
rawer
,
type
)
=>
co
(
function
*
()
{
this
.
pushEntity
=
(
req
,
rawer
,
type
)
=>
co
(
function
*
()
{
...
@@ -117,6 +117,9 @@ function WebAdmin (duniterServer) {
...
@@ -117,6 +117,9 @@ function WebAdmin (duniterServer) {
this
.
startHTTP
=
()
=>
co
(
function
*
()
{
this
.
startHTTP
=
()
=>
co
(
function
*
()
{
yield
pluggedDALP
;
yield
pluggedDALP
;
try
{
try
{
if
(
!
bmapi
)
{
bmapi
=
yield
bma
(
server
,
null
,
true
);
}
yield
bmapi
.
openConnections
();
yield
bmapi
.
openConnections
();
return
{
success
:
true
};
return
{
success
:
true
};
}
catch
(
e
)
{
}
catch
(
e
)
{
...
@@ -265,7 +268,7 @@ function WebAdmin (duniterServer) {
...
@@ -265,7 +268,7 @@ function WebAdmin (duniterServer) {
yield
bmapi
.
closeConnections
();
yield
bmapi
.
closeConnections
();
yield
server
.
loadConf
();
yield
server
.
loadConf
();
bmapi
=
yield
bma
(
server
,
null
,
true
);
bmapi
=
yield
bma
(
server
,
null
,
true
);
//
yield bmapi.openConnections();
yield
bmapi
.
openConnections
();
yield
server
.
recomputeSelfPeer
();
yield
server
.
recomputeSelfPeer
();
});
});
yield
pluggedConfP
;
yield
pluggedConfP
;
...
...
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