Tune logging, prepare infra for websocket (#88)

* fix nginx for websocket
* some log mods

Author: gzp79

.github/workflows/ci.yml

@@ -132,10 +132,9 @@ jobs:
       - name: Create release artifacts
         if: github.ref == 'refs/heads/master'
         run: |
-          echo "[build]" >> fly.toml
-          echo "  image = \"${{ steps.meta.outputs.tags }}\"" >> fly.toml
+          sed -i 's/%DOCKER_IMAGE%/${{ steps.meta.outputs.tags }}/g' fly.json
           mkdir -p release
-          cp fly.toml ./release/
+          cp fly.json ./release/
 
       - name: Publish release artifacts
         if: github.ref == 'refs/heads/master'

crates/shine-core/src/azure/azure_keyvault_config.rs

@@ -75,7 +75,7 @@ impl ConfigAsyncSource for AzureKeyvaultConfigSource {
             }
         }
 
-        log::info!("keyvault config: {:#?}", config);
+        //log::info!("keyvault config: {:#?}", config);
         Ok(config)
     }
 }

crates/shine-core/src/web/web_app.rs

@@ -12,7 +12,7 @@ use axum::{
 };
 use axum_server::Handle;
 use serde::de::DeserializeOwned;
-use std::{env, fs, future::Future, net::SocketAddr, time::Duration as StdDuration};
+use std::{env, fmt::Debug, fs, future::Future, net::SocketAddr, time::Duration as StdDuration};
 use tokio::{
     net::TcpListener,
     runtime::{Handle as RtHandle, Runtime},
@@ -88,7 +88,7 @@ async fn graceful_shutdown(handle: Handle) {
 }
 
 pub trait WebApplication {
-    type AppConfig: DeserializeOwned + Send + Sync + 'static;
+    type AppConfig: DeserializeOwned + Debug + Send + Sync + 'static;
     type AppState: Clone + Send + Sync + 'static;
 
     fn feature_name(&self) -> &'static str;

crates/shine-core/src/web/web_config.rs

@@ -1,6 +1,7 @@
 use crate::telemetry::TelemetryConfig;
 use anyhow::{anyhow, Error as AnyError};
 use serde::{de::DeserializeOwned, Deserialize};
+use std::fmt::Debug;
 
 use super::{CoreConfig, ServiceConfig};
 
@@ -18,14 +19,15 @@ pub struct WebAppConfig<F> {
 
 impl<F> WebAppConfig<F>
 where
-    F: DeserializeOwned,
+    F: DeserializeOwned + Debug,
 {
     pub async fn load_config(stage: &str) -> Result<Self, AnyError> {
         let pre_init = CoreConfig::new(stage)?;
         let builder = pre_init.create_config_builder()?;
         let config = builder.build().await?;
 
         let cfg: Self = config.try_deserialize()?;
+        log::info!("Config loaded: {:#?}", cfg);
 
         if pre_init != cfg.core {
             Err(anyhow!("Core config mismatch"))

fly.json

@@ -0,0 +1,53 @@
+{
+  "app": "shine-app",
+  "primary_region": "cdg",
+
+  "build": {
+    "image": "ghcr.io/gzp79/shine-services:sha-4035eeb"
+  },
+
+  "services": [
+    {
+      "protocol": "tcp",
+      "internal_port": 80,
+      "auto_stop_machines": true,
+      "auto_start_machines": true,
+      "min_machines_running": 0,
+
+      "ports": [
+        {
+          "port": 80,
+          "handlers": ["http"],
+          "force_https": true
+        },
+        {
+          "port": 443,
+          "handlers": ["tls", "http"]
+        }
+      ],
+
+      "concurrency": {
+        "hard_limit": 25,
+        "soft_limit": 20
+      },
+
+      "tcp_checks": [
+        {
+          "interval": "10s",
+          "timeout": "2s"
+        }
+      ]
+    }
+  ],
+
+  "metrics": [
+    {
+      "port": 80,
+      "path": "identity/api/telemetry/metrics"
+    },
+    {
+      "port": 80,
+      "path": "builder/api/telemetry/metrics"
+    }
+  ]
+}

fly.toml

@@ -9,6 +9,7 @@
     "telemetry": {
         "allowReconfigure": true,
         "enableConsoleLog": true,
+        "defaultLevel": "INFO,shine_builder=TRACE",
         "metrics": true,
         "tracing": {
             "type": "stdOut"