Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
5845ca04
Unverified
Commit
5845ca04
authored
Nov 22, 2019
by
SparkSnail
Committed by
GitHub
Nov 22, 2019
Browse files
Fix log initialization (#1755)
parent
a63f2ed3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
src/nni_manager/common/log.ts
src/nni_manager/common/log.ts
+1
-5
src/nni_manager/main.ts
src/nni_manager/main.ts
+6
-2
No files found.
src/nni_manager/common/log.ts
View file @
5845ca04
...
@@ -155,11 +155,7 @@ class Logger {
...
@@ -155,11 +155,7 @@ class Logger {
}
}
}
}
function
getLogger
(
fileName
?:
string
):
Logger
{
function
getLogger
():
Logger
{
component
.
Container
.
bind
(
Logger
).
provider
({
get
:
():
Logger
=>
new
Logger
(
fileName
)
});
return
component
.
get
(
Logger
);
return
component
.
get
(
Logger
);
}
}
...
...
src/nni_manager/main.ts
View file @
5845ca04
...
@@ -49,7 +49,7 @@ function initStartupInfo(
...
@@ -49,7 +49,7 @@ function initStartupInfo(
setExperimentStartupInfo
(
createNew
,
expId
,
basePort
,
logDirectory
,
experimentLogLevel
,
readonly
);
setExperimentStartupInfo
(
createNew
,
expId
,
basePort
,
logDirectory
,
experimentLogLevel
,
readonly
);
}
}
async
function
initContainer
(
platformMode
:
string
):
Promise
<
void
>
{
async
function
initContainer
(
platformMode
:
string
,
logFileName
?:
string
):
Promise
<
void
>
{
if
(
platformMode
===
'
local
'
)
{
if
(
platformMode
===
'
local
'
)
{
Container
.
bind
(
TrainingService
)
Container
.
bind
(
TrainingService
)
.
to
(
LocalTrainingService
)
.
to
(
LocalTrainingService
)
...
@@ -82,6 +82,9 @@ async function initContainer(platformMode: string): Promise<void> {
...
@@ -82,6 +82,9 @@ async function initContainer(platformMode: string): Promise<void> {
Container
.
bind
(
DataStore
)
Container
.
bind
(
DataStore
)
.
to
(
NNIDataStore
)
.
to
(
NNIDataStore
)
.
scope
(
Scope
.
Singleton
);
.
scope
(
Scope
.
Singleton
);
Container
.
bind
(
Logger
).
provider
({
get
:
():
Logger
=>
new
Logger
(
logFileName
)
});
const
ds
:
DataStore
=
component
.
get
(
DataStore
);
const
ds
:
DataStore
=
component
.
get
(
DataStore
);
await
ds
.
init
();
await
ds
.
init
();
...
@@ -145,13 +148,14 @@ initStartupInfo(startMode, experimentId, port, logDir, logLevel, readonly);
...
@@ -145,13 +148,14 @@ initStartupInfo(startMode, experimentId, port, logDir, logLevel, readonly);
mkDirP
(
getLogDir
())
mkDirP
(
getLogDir
())
.
then
(
async
()
=>
{
.
then
(
async
()
=>
{
const
log
:
Logger
=
getLogger
();
try
{
try
{
await
initContainer
(
mode
);
await
initContainer
(
mode
);
const
restServer
:
NNIRestServer
=
component
.
get
(
NNIRestServer
);
const
restServer
:
NNIRestServer
=
component
.
get
(
NNIRestServer
);
await
restServer
.
start
();
await
restServer
.
start
();
const
log
:
Logger
=
getLogger
();
log
.
info
(
`Rest server listening on:
${
restServer
.
endPoint
}
`
);
log
.
info
(
`Rest server listening on:
${
restServer
.
endPoint
}
`
);
}
catch
(
err
)
{
}
catch
(
err
)
{
const
log
:
Logger
=
getLogger
();
log
.
error
(
`
${
err
.
stack
}
`
);
log
.
error
(
`
${
err
.
stack
}
`
);
throw
err
;
throw
err
;
}
}
...
...
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