Merge pull request #496 from marle3003/develop

v.0.13.1

Author: marle3003

docs/configuration/dynamic/git.md

@@ -48,19 +48,19 @@ MOKAPI_PROVIDERS_GIT_URL=https://github.com/PATH-TO/REPOSITORY?ref=branch-name
 ```
 
 ### Pull Interval
-Defines in which interval Mokapi pulls possible changes, default 5 seconds.
+Defines in which interval Mokapi pulls possible changes, default 3 minutes.
 Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
 
 ```yaml tab=File (YAML)
 providers:
   git:
-    pullInterval: 2h45m
+    pullInterval: 3m30s
 ```
 ```bash tab=CLI
---providers-git-pull-interval 2h45m
+--providers-git-pull-interval 3m30s
 ```
 ```bash tab=Env
-MOKAPI_PROVIDERS_GIT_PULL-INTERVAL=2h45m
+MOKAPI_PROVIDERS_GIT_PULL-INTERVAL=3m30s
 ```
 
 ## Advanced Repository Settings
@@ -109,7 +109,7 @@ providers:
   git:
     repositories:
       - url: https://github.com/PATH-TO/REPOSITORY
-        pullInterval: 2h45m
+        pullInterval: 3m30s
 ```
 
 ### TempDir

docs/configuration/dynamic/http.md

@@ -53,19 +53,19 @@ MOKAPI_PROVIDERS_HTTP_URL=http://127.0.0.1/api
 ```
 
 ### Poll Interval
-Defines in which interval possible changes are checked, default 5 seconds. 
+Defines in which interval possible changes are checked, default 3 minutes. 
 Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
 
 ```yaml tab=File (YAML)
 providers:
   http:
-    pollInterval: 2h45m
+    pollInterval: 3m30s
 ```
 ```bash tab=CLI
---providers-http-poll-interval 2h45m
+--providers-http-poll-interval 3m30s
 ```
 ```bash tab=Env
-MOKAPI_PROVIDERS_HTTP_POLL_INTERVAL=2h45m
+MOKAPI_PROVIDERS_HTTP_POLL_INTERVAL=3m30s
 ```
 
 ### Poll Timeout

examples/mokapi/http_handler.js

@@ -1,4 +1,4 @@
-import { on, env } from 'mokapi'
+import { on, env, sleep } from 'mokapi'
 import { clusters, events as kafkaEvents, configs as kafkaConfigs } from 'kafka.js'
 import { apps as httpServices, events as httpEvents, configs as httpConfigs } from 'services_http.js'
 import { server as smtpServers, mails, mailEvents, getMail, getAttachment } from 'smtp.js'
@@ -87,6 +87,7 @@ export default async function() {
                 return true
             }
             case 'validate':
+                sleep(1000)
                 let url = `${apiBaseUrl}/api/schema/validate`
                 if (request.query['outputFormat']) {
                     url += '?outputFormat=' + request.query['outputFormat']

providers/openapi/handler.go

@@ -296,11 +296,11 @@ func writeError(rw http.ResponseWriter, r *http.Request, err error, serviceName
 		status = http.StatusInternalServerError
 	}
 
-	entry := log.WithFields(log.Fields{"url": r.URL, "method": r.Method, "status": status})
+	logMessage := fmt.Sprintf("HTTP request failed with status code %d: %s %s: %s", status, r.Method, r.URL.String(), err.Error())
 	if status == http.StatusInternalServerError {
-		entry.Error(message)
+		log.Errorf(logMessage)
 	} else {
-		entry.Info(message)
+		log.Infof(logMessage)
 	}
 	if m, ok := monitor.HttpFromContext(r.Context()); ok {
 		endpointPath := r.Context().Value("endpointPath")

webui/src/components/dashboard/SchemaValidate.vue

@@ -30,6 +30,7 @@ const state = reactive({
     errors: '',
     result: null,
     validated: false,
+    validating: false,
     view: 'preview'
 })
 
@@ -73,6 +74,9 @@ function setExample() {
 }
 
 function validate() {
+    state.validating = true
+    state.validated = false
+
     const body = {
         format: props.schema.format,
         schema: props.schema.schema,
@@ -102,6 +106,7 @@ function validate() {
             }))
         }
     }).then(({ status, body }) => {
+        state.validating = false
         state.validated = true
 
         if (status === 500) {
@@ -193,8 +198,9 @@ function formatResultItem(result: any): [string, number] {
                     <div class="modal-footer justify-content-between">
                         <span class="float-start">
                             <span  class="status" role="status">
-                                <i v-if="state.errors.length == 0 && state.result == null && state.validated" class="valid bi bi-check-circle-fill"> Valid</i>
-                                <i v-else-if="state.validated" class="failed bi bi-x-circle-fill"> Failed</i>
+                                <span v-if="state.validating" class="loading"><i class="bi bi-arrow-repeat spin"></i> Validating...</span>
+                                <i v-else-if="state.errors.length == 0 && state.result == null && state.validated" class="valid bi bi-check-circle-fill fade-in"> Valid</i>
+                                <i v-else-if="state.validated" class="failed bi bi-x-circle-fill fade-in"> Failed</i>
                             </span>
                         </span>
                         <div class="float-end">
@@ -222,4 +228,22 @@ function formatResultItem(result: any): [string, number] {
 .modal-footer .status .failed {
     color: var(--color-red);
 }
+.modal-footer .status .loading {
+    color: var(--color-blue);
+}
+.spin {
+    display: inline-block;
+    animation: spin 1s linear infinite;
+}
+@keyframes spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+}
+.fade-in {
+    animation: fadeIn 0.5s ease-in-out;
+}
+@keyframes fadeIn {
+    from { opacity: 0; }
+    to { opacity: 1; }
+}
 </style>