diff options
| author | Simon Rettberg | 2020-12-02 12:54:27 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-12-02 12:54:27 +0100 |
| commit | 656e776498fe862b1b388435568c5bb72213cb16 (patch) | |
| tree | 855d21b40e4ccb9c07664e4922632da2a883d99d /src/server | |
| parent | [CLIENT] print help and version number correctly (diff) | |
| download | dnbd3-656e776498fe862b1b388435568c5bb72213cb16.tar.gz dnbd3-656e776498fe862b1b388435568c5bb72213cb16.tar.xz dnbd3-656e776498fe862b1b388435568c5bb72213cb16.zip | |
[BUILD] Include branch and build timestamp in binaries
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/rpc.c | 2 | ||||
| -rw-r--r-- | src/server/server.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/server/rpc.c b/src/server/rpc.c index 9bef5ee..566f35c 100644 --- a/src/server/rpc.c +++ b/src/server/rpc.c @@ -312,7 +312,7 @@ static bool handleStatus(int sock, int permissions, struct field *fields, size_t "runId", randomRunId ); } if ( version ) { - json_object_set_new( statisticsJson, "version", json_string( DNBD3_VERSION ) ); + json_object_set_new( statisticsJson, "version", json_string( DNBD3_VERSION_LONG ", built " DNBD3_BUILD_DATE ) ); json_object_set_new( statisticsJson, "build", json_string( DNBD3_BUILD ) ); } if ( space ) { diff --git a/src/server/server.c b/src/server/server.c index ec2e24c..6d1366f 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -106,7 +106,8 @@ static void queueJobInternal(job_t *job); */ void dnbd3_printHelp(char *argv_0) { - printf( "Version: %s\n\n", DNBD3_VERSION ); + printf( "Version: %s\n\n", DNBD3_VERSION_LONG ); + printf( "Built: %s\n", DNBD3_BUILD_DATE ); printf( "Usage: %s [OPTIONS]...\n", argv_0 ); printf( "Start the DNBD3 server\n" ); printf( "-c or --config Configuration directory (default /etc/dnbd3-server/)\n" ); @@ -131,7 +132,8 @@ void dnbd3_printHelp(char *argv_0) */ void dnbd3_printVersion() { - printf( "dnbd3-server version: %s\n", DNBD3_VERSION ); + printf( "dnbd3-server version: %s\n", DNBD3_VERSION_LONG ); + printf( "Built: %s\n", DNBD3_BUILD_DATE ); exit( 0 ); } @@ -373,7 +375,7 @@ int main(int argc, char *argv[]) logadd( LOG_INFO, "DNBD3 server starting...." ); logadd( LOG_INFO, "Machine type: " DNBD3_ENDIAN_MODE ); logadd( LOG_INFO, "Build Type: %s", DNBD3_BUILD ); - logadd( LOG_INFO, "Version: %s", DNBD3_VERSION ); + logadd( LOG_INFO, "Version: %s, built %s", DNBD3_VERSION_LONG, DNBD3_BUILD_DATE ); if ( altservers_load() < 0 ) { logadd( LOG_WARNING, "Could not load alt-servers. Does the file exist in %s?", _configDir ); |