Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ RUN npm update --legacy-peer-deps
RUN npm run build --release

FROM alpine:3.18
MAINTAINER Jens Thiel <thielj@gmail.com>
LABEL maintainer="zn-luo"
WORKDIR /opt/nats
VOLUME /data
#VOLUME /data
RUN apk update && apk upgrade && \
apk add --no-cache libgcc libssl1.1 libcrypto1.1 ca-certificates sqlite-libs && \
update-ca-certificates && \
Expand All @@ -28,5 +28,5 @@ RUN apk update && apk upgrade && \
COPY --from=backend-builder /usr/src/NATS-WebUI/target/release/nats-webui /opt/nats/nats-webui
COPY --from=frontend-builder /usr/src/NATS-WebUI/web/dist/ /opt/nats/web/dist
USER 1000:1000
EXPOSE 80
EXPOSE 8600
ENTRYPOINT ["/opt/nats/nats-webui"]
14 changes: 7 additions & 7 deletions src/datatypes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub struct Publication {
#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
pub struct ServerVarz {
pub server_id: String,
pub server_name: String,
pub server_name: Option<String>,
pub version: String,
pub proto: i32,
pub go: String,
Expand Down Expand Up @@ -125,20 +125,20 @@ pub struct ServerVarz {
pub websocket: Option<serde_json::Value>,
#[serde(default)]
pub jetstream: Option<JetstreamConfig>,
pub tls_timeout: i64,
pub tls_timeout: f64,
pub write_deadline: i64,
pub start: String,
pub now: String,
pub uptime: String,
pub mem: i64,
pub cores: i32,
pub gomaxprocs: i32,
pub gomaxprocs: Option<i32>,
pub cpu: f64,
pub connections: i64,
pub total_connections: i64,
pub routes: i64,
pub remotes: i64,
pub leafnodes: i64,
pub leafnodes: Option<i64>,
pub in_msgs: i64,
pub out_msgs: i64,
pub in_bytes: i64,
Expand All @@ -149,7 +149,7 @@ pub struct ServerVarz {
pub config_load_time: String,
#[serde(default)]
pub system_account: Option<String>,
pub slow_consumer_stats: SlowConsumerStats,
pub slow_consumer_stats: Option<SlowConsumerStats>,
#[serde(default)]
pub git_commit: Option<String>,
}
Expand All @@ -163,7 +163,7 @@ pub struct ClusterInfo {
#[serde(default)]
pub auth_timeout: Option<i64>,
#[serde(default)]
pub tls_timeout: Option<i64>,
pub tls_timeout: Option<f64>,
#[serde(default)]
pub tls_required: Option<bool>,
#[serde(default)]
Expand All @@ -178,7 +178,7 @@ pub struct ClusterInfo {
pub struct MqttConfig {
pub host: String,
pub port: u16,
pub tls_timeout: i64,
pub tls_timeout: f64,
}

#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ async fn main() -> rusqlite::Result<()> {
.or(client_subscribe_route)
.with(warp::log("web"));

debug!("Starting server on 0.0.0.0:80");
warp::serve(route).run(([0, 0, 0, 0], 80)).await;
debug!("Starting server on 0.0.0.0:8600");
warp::serve(route).run(([0, 0, 0, 0], 8600)).await;

Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</el-container>

<el-footer style="border-top: solid 1px #e6e6e6; height: 24px; text-align: right; vertical-align: middle; font-size: x-small; line-height: 24px;">
<font-awesome-icon :icon="['fas', 'copyright']"/> sphqxe, thielj <a href="https://github.com/thielj">github.com/thielj/NATS-WebUI</a>
<font-awesome-icon :icon="['fas', 'copyright']"/> sphqxe, thielj, zn-luo <a href="https://github.com/zn-luo/NATS-WebUI">github.com/zn-luo/NATS-WebUI</a>
</el-footer>
</el-container>
</template>
Expand Down