ISSUE_ID:34 refine status treatment and refine error message

Author: SHIRAKI-Takayoshi

webapi/src/main/java/com/tsurugidb/belayer/webapi/api/DbControlApiHandler.java

@@ -75,8 +75,12 @@ public Mono<ServerResponse> startDatabase(ServerRequest req) {
                                 log.debug("db launch mode:" + mode);
                                 var status = dbControlService.startDatabase("start", (String) auth.getCredentials(),
                                         mode, replicateFrom, autoFetchWal);
-                                if (ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
-                                    return ServerResponse.badRequest().body(BodyInserters.fromValue(new ErrorResult(status.toStatusString())));
+
+                                if (status == null || ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
+                                    var statusString = status != null ? status.toStatusString() : "status unknown";
+                                    var errorMessage = String.format("Failed to execute command. %s", statusString);
+                                    return ServerResponse.badRequest()
+                                            .body(BodyInserters.fromValue(new ErrorResult(errorMessage)));
                                 }
                                 return ServerResponse.ok().build();
                             });
@@ -94,8 +98,10 @@ public Mono<ServerResponse> shutdownDatabase(ServerRequest req) {
                 .map(SecurityContext::getAuthentication)
                 .flatMap(auth -> {
                     var status = dbControlService.shutdownDatabase("shutdown", (String) auth.getCredentials());
-                    if (ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
-                        return ServerResponse.badRequest().body(BodyInserters.fromValue(new ErrorResult(status.toStatusString())));
+                    if (status == null || ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
+                        var statusString = status != null ? status.toStatusString() : "status unknown";
+                        var errorMessage = String.format("Failed to execute command. %s", statusString);
+                        return ServerResponse.badRequest().body(BodyInserters.fromValue(new ErrorResult(errorMessage)));
                     }
                     return ServerResponse.ok().build();
                 });
@@ -132,8 +138,11 @@ public Mono<ServerResponse> changeLaunchMode(ServerRequest req) {
                                 var status = dbControlService.changeDatabaseMode("change_mode",
                                         (String) auth.getCredentials(), mode,
                                         from, autoFetchWal);
-                                if (ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
-                                    return ServerResponse.badRequest().body(BodyInserters.fromValue(new ErrorResult(status.toStatusString())));
+                                if (status == null || ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
+                                    var statusString = status != null ? status.toStatusString() : "status unknown";
+                                    var errorMessage = String.format("Failed to execute command. %s", statusString);
+                                    return ServerResponse.badRequest()
+                                            .body(BodyInserters.fromValue(new ErrorResult(errorMessage)));
                                 }
                                 return ServerResponse.ok().build();
                             });
@@ -159,8 +168,12 @@ public Mono<ServerResponse> syncTransactionLog(ServerRequest req) {
                                 }
                                 var status = dbControlService.synchronizeTransactionLog("sync_wal",
                                         (String) auth.getCredentials(), fromHost);
-                                if (ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
-                                    return ServerResponse.badRequest().body(BodyInserters.fromValue(new ErrorResult(status.toStatusString())));
+
+                                if (status == null || ExecStatus.STATUS_FAILURE.equals(status.getStatus())) {
+                                    var statusString = status != null ? status.toStatusString() : "status unknown";
+                                    var errorMessage = String.format("Failed to execute command. %s", statusString);
+                                    return ServerResponse.badRequest()
+                                            .body(BodyInserters.fromValue(new ErrorResult(errorMessage)));
                                 }
                                 return ServerResponse.ok().build();
                             });

webapi/src/main/java/com/tsurugidb/belayer/webapi/dto/ExecStatus.java

@@ -74,9 +74,9 @@ public String toStatusString() {
 
         switch (kind) {
             case KIND_START:
-                return String.format("[%s]%s", toTimestampString(), kind);
+                return String.format("[%s]", toTimestampString(), kind);
             case KIND_FINISH:
-                return String.format("[%s]%s:status:%s,reason=%s,cause=%s,message=%s,code=%s,arguments=%s",
+                return String.format("[%s]status:%s,reason=%s,cause=%s,message=%s,code=%s,arguments=%s",
                         toTimestampString(), kind, status, reason, cause, message, code, arguments);
             case KIND_PROGRESS:
                 return String.format("[%s]%s:%s", toTimestampString(), kind, toPercentage(progress));
@@ -87,7 +87,7 @@ public String toStatusString() {
 
     private String toTimestampString() {
         if (this.timestamp == null) {
-            return "?";
+            return "";
         }
 
         return LocalDateTime.ofEpochSecond(this.timestamp, 0, ZoneOffset.UTC).format(DATE_FORMAT);