Skip to content

[feat]: enriched logging on upload with version information #2913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2024
Merged

[feat]: enriched logging on upload with version information #2913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a80a562
enriched logging on upload with version information
foxriver76 Sep 19, 2024
bc86eb3
rm empty line
foxriver76 Sep 19, 2024
660508b
Merge branch 'master' into upload-version-info
foxriver76 Sep 20, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* (@foxriver76) extend the time to wait until controller is stopped on controller UI upgrade
* (@foxriver76) improved backup/restore process to work for arbitrary large installations
* (@GermanBluefox/@foxriver76) implemented automatic upload on adapter start if version mismatch is detected
* (@foxriver76) enriched logging on upload with version information

## 6.0.11 (2024-08-21) - Kiera
* (foxriver76) only generate `packageUpdates` notification, if new updates detected
Expand Down
18 changes: 11 additions & 7 deletions packages/cli/src/lib/setup/setupUpload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export class Upload {
const now = Date.now();
if (now - this.lastProgressUpdate > 1_000) {
this.lastProgressUpdate = now;
await this.states.setStateAsync(uploadID, {
await this.states.setState(uploadID, {
val: Math.round((1_000 * (files.length - f)) / files.length) / 10,
ack: true
});
Expand All @@ -453,7 +453,7 @@ export class Upload {

// Set upload progress to 0;
if (!isAdmin && files.length) {
await this.states.setStateAsync(uploadID, { val: 0, ack: true });
await this.states.setState(uploadID, { val: 0, ack: true });
}

return adapter;
Expand Down Expand Up @@ -553,12 +553,12 @@ export class Upload {
let obj;
const uploadID = `system.adapter.${adapter}.upload`;
try {
obj = await this.objects.getObjectAsync(uploadID);
obj = await this.objects.getObject(uploadID);
} catch {
// ignore
}
if (!obj) {
await this.objects.setObjectAsync(uploadID, {
await this.objects.setObject(uploadID, {
_id: uploadID,
type: 'state',
common: {
Expand Down Expand Up @@ -722,7 +722,7 @@ export class Upload {
if (res) {
for (const row of res.rows) {
if (row.value?.common.host === hostname) {
const _obj = await this.objects.getObjectAsync(row.id);
const _obj = await this.objects.getObject(row.id);
const newObject = deepClone(_obj) as ioBroker.InstanceObject;

// TODO: refactor the following assignments into a method, where we can define which attributes need a real override and their defaults
Expand Down Expand Up @@ -822,9 +822,13 @@ export class Upload {
}
ioPackFile = null;
}

ioPack = ioPack || ioPackFile;

if (ioPack) {
logger.log(
`Updating objects from io-package.json for adapter "${name}" with version "${ioPack.common.version}"`
);
// Always update installedFrom from File on disk if exists and set
if (ioPackFile?.common?.installedFrom) {
ioPack.common = ioPack.common || {};
Expand Down Expand Up @@ -869,8 +873,8 @@ export class Upload {
obj.ts = Date.now();

try {
await this.objects.setObjectAsync(`system.adapter.${name}`, obj);
await this.objects.setObjectAsync(`system.host.${hostname}.adapter.${name}`, obj);
await this.objects.setObject(`system.adapter.${name}`, obj);
await this.objects.setObject(`system.host.${hostname}.adapter.${name}`, obj);
} catch (e) {
logger.error(
`Cannot set "system.adapter.${name}" and "system.host.${hostname}.adapters.${name}": ${e.message}`
Expand Down