Compare commits

...

5 Commits

Author SHA1 Message Date
TheThing f01fc2ac02 sc: Fix new ABI showing running always false
continuous-integration/appveyor/branch AppVeyor build succeeded Details
2024-04-06 17:36:35 +00:00
Jonatan Nilsson d175782f73 updater: Return latest version, not the latest installed one. Failed installs will be hidden otherwise.
continuous-integration/appveyor/branch AppVeyor build succeeded Details
2022-08-18 11:13:17 +00:00
Jonatan Nilsson bdaf58b7b0 util: Fix bug where application config was still being leaked
continuous-integration/appveyor/branch AppVeyor build succeeded Details
2022-04-02 20:21:46 +00:00
Jonatan Nilsson 7f6d1546f2 util: Do not expose the entire application config, only relevant parts
continuous-integration/appveyor/branch AppVeyor build succeeded Details
2022-04-02 20:13:35 +00:00
Jonatan Nilsson e853474cdd loghelper: Fix a bug when parsing a JSON-parsed record. In those cases the time is not Date format and needs to be parsed beforehand.
continuous-integration/appveyor/branch AppVeyor build succeeded Details
package: Release new version
2022-04-01 10:08:24 +00:00
5 changed files with 18 additions and 7 deletions

View File

@ -102,7 +102,7 @@ export async function listentoapp(ctx, data) {
if (!app) return if (!app) return
ctx.socket.join('app.' + data.name) ctx.socket.join('app.' + data.name)
let version = ctx.db.get(ctx.db.data.core[app.name].versions, ctx.db.data.core[app.name].latestInstalled) let version = ctx.db.data.core[app.name].versions[0]
ctx.socket.emit('app.updatelog', { ctx.socket.emit('app.updatelog', {
name: data.name, name: data.name,
log: version?.log || ctx.db.data.core[app.name].updater log: version?.log || ctx.db.data.core[app.name].updater

View File

@ -68,8 +68,10 @@ export function formatLog(data) {
delete rec.v; delete rec.v;
let d = new Date(rec.time)
// Time. // Time.
var time = '[' + rec.time.toISOString().replace('T', ' ').replace('Z', '') + ']' var time = '[' + d.toISOString().replace('T', ' ').replace('Z', '') + ']'
time = stylize(time, 'none') time = stylize(time, 'none')
delete rec.time; delete rec.time;

View File

@ -19,13 +19,20 @@ export function safeWrap(log, name, fn) {
export function getConfig(ctx) { export function getConfig(ctx) {
let merge = { let merge = {
applications: [] applications: [],
name: ctx.db.config.name || '',
title: ctx.db.config.title || '',
} }
for (let app of ctx.core.applications) { for (let app of ctx.core.applications) {
merge[app.name] = app.config merge[app.name] = {
provider: app.config.provider || null,
url: app.config.url || null,
port: app.config.port || null,
scAllowStop: app.config.scAllowStop || null,
}
merge.applications.push(app.name) merge.applications.push(app.name)
} }
return defaults(ctx.db.config, merge) return merge
} }
export function getApp(ctx, name, action) { export function getApp(ctx, name, action) {
@ -83,7 +90,7 @@ export function getStatus(ctx) {
active: active, active: active,
latestInstalled: installed, latestInstalled: installed,
updated: appDb.updater, updated: appDb.updater,
running: app.running, running: app.running || app.ctx.version,
updating: app.updating, updating: app.updating,
} }
} }

View File

@ -10,6 +10,8 @@ const core = {
status: {}, status: {},
} }
window.core = core
socket.on('core.config', function(res) { socket.on('core.config', function(res) {
core.apps = [] core.apps = []
let keys = Object.keys(res) let keys = Object.keys(res)

View File

@ -1,6 +1,6 @@
{ {
"name": "sc-manager", "name": "sc-manager",
"version": "2.0.1", "version": "2.0.6",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {