Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
keeleliin-wrapper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
keeleliin
keeleliin-wrapper
Commits
e8f99859
Commit
e8f99859
authored
Jan 12, 2016
by
priit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Teenuse install url-lt
parent
f34d0281
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
12 deletions
+26
-12
controllers/api/v1/service.js
controllers/api/v1/service.js
+10
-0
src/service/integration/installService.js
src/service/integration/installService.js
+16
-5
www/server.js
www/server.js
+0
-7
No files found.
controllers/api/v1/service.js
View file @
e8f99859
...
...
@@ -10,6 +10,16 @@ router.get('/config', function(req, res) {
return
res
.
send
(
installService
.
getConfiguration
());
});
router
.
get
(
'
/install
'
,
function
(
req
,
res
)
{
installService
.
install
(
function
(
err
,
success
)
{
if
(
err
){
res
.
status
(
520
);
res
.
send
({
errors
:
err
});
return
;
}
res
.
send
({
responses
:
success
});
});
});
router
.
post
(
'
/
'
,
function
(
req
,
res
)
{
...
...
src/service/integration/installService.js
View file @
e8f99859
...
...
@@ -12,6 +12,12 @@ var InstallService = function() {
var
wrapper
=
config
.
wrapper
;
var
serviceConfig
=
self
.
getConfiguration
();
if
(
!
config
.
integration
||
config
.
integration
.
length
==
0
){
return
cb
(
'
Servereid ei ole seadistatud
'
);
}
var
messages
=
[];
async
.
each
(
config
.
integration
,
function
(
serverConf
,
innerCb
)
{
logger
.
debug
(
serverConf
);
...
...
@@ -22,18 +28,23 @@ var InstallService = function() {
json
:
serviceConfig
},
function
(
error
,
response
,
body
)
{
if
(
error
){
logger
.
error
(
serverConf
.
installUrl
);
logger
.
error
(
self
.
getConfiguration
()
);
logger
.
error
(
serverConf
.
installUrl
);
logger
.
error
(
self
.
getConfiguration
()
);
logger
.
error
(
error
);
return
innerCb
(
error
);
}
innerCb
(
null
,
true
);
messages
.
push
({
url
:
serverConf
.
installUrl
,
response
:
body
});
innerCb
(
null
);
});
},
function
(
err
)
{
logger
.
debug
(
'
Installed
'
);
cb
(
err
,
true
)
cb
(
err
,
messages
)
});
};
...
...
www/server.js
View file @
e8f99859
...
...
@@ -77,13 +77,6 @@ function startCluster( instanceCount, cb ){
cleanerService
.
init
();
//Lase serveril üles ärgata
setTimeout
(
function
(){
installService
.
install
(
function
()
{
log4jsLogger
.
trace
(
'
Instal callback
'
);
})
},
((
Math
.
random
()
*
20000
)
+
5000
));
}
else
{
startInstance
(
cb
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment