diff options
| author | Simon Rettberg | 2018-04-27 10:55:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-27 10:55:42 +0200 |
| commit | f69ae362475546d39bbac4730148b6637c62b742 (patch) | |
| tree | 66b52019e7dc8785ff6cc2afef6970c4e9719953 | |
| parent | [SERVER] Fix deadlock on shutdown (via image_tryFreeAll) (diff) | |
| download | dnbd3-f69ae362475546d39bbac4730148b6637c62b742.tar.gz dnbd3-f69ae362475546d39bbac4730148b6637c62b742.tar.xz dnbd3-f69ae362475546d39bbac4730148b6637c62b742.zip | |
[SERVER] Proper exit code and message when shutting down due to error or signal
| -rw-r--r-- | src/server/server.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/server.c b/src/server/server.c index e2314a2..71b791a 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -308,10 +308,14 @@ int main(int argc, char *argv[]) logadd( LOG_INFO, "Loading images...." ); // Load all images in base path if ( !image_loadAll( NULL ) || _shutdown ) { - logadd( LOG_ERROR, "Could not load images." ); + if ( _shutdown ) { + logadd( LOG_ERROR, "Received shutdown request while loading images." ); + } else { + logadd( LOG_ERROR, "Could not load images." ); + } free( bindAddress ); dnbd3_cleanup(); - return 0; + return _shutdown ? 0 : 1; } // Give other threads some time to start up before accepting connections |