Skip to content

Commit 5841814

Browse files
committed
restart api after removal, fix version upon load
1 parent 98847c4 commit 5841814

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

api/src/unraid-api/config/api-config.module.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger, Module } from '@nestjs/common';
1+
import { Injectable, Logger, Module, OnApplicationBootstrap } from '@nestjs/common';
22
import { ConfigService, registerAs } from '@nestjs/config';
33
import path from 'path';
44

@@ -50,7 +50,10 @@ export const loadApiConfig = async () => {
5050
export const apiConfig = registerAs<ApiConfig>('api', loadApiConfig);
5151

5252
@Injectable()
53-
export class ApiConfigPersistence extends ConfigFilePersister<ApiConfig> {
53+
export class ApiConfigPersistence
54+
extends ConfigFilePersister<ApiConfig>
55+
implements OnApplicationBootstrap
56+
{
5457
constructor(configService: ConfigService) {
5558
super(configService);
5659
}
@@ -79,12 +82,17 @@ export class ApiConfigPersistence extends ConfigFilePersister<ApiConfig> {
7982
return createDefaultConfig();
8083
}
8184

85+
async onApplicationBootstrap() {
86+
this.configService.set('api.version', API_VERSION);
87+
}
88+
8289
async migrateConfig(): Promise<ApiConfig> {
8390
const legacyConfig = this.configService.get('store.config', {});
8491
const migrated = this.convertLegacyConfig(legacyConfig);
8592
return {
8693
...this.defaultConfig(),
8794
...migrated,
95+
version: API_VERSION,
8896
};
8997
}
9098

packages/unraid-shared/src/util/config-file-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export class ConfigFileHandler<T extends object> {
122122

123123
try {
124124
const data = JSON.stringify(config, null, 2);
125-
this.logger.verbose("Writing config");
125+
this.logger.verbose(`Writing config to ${this.definition.configPath()} ${data}`);
126126
await writeFile(this.definition.configPath(), data);
127127
return true;
128128
} catch (error) {

plugin/plugins/dynamix.unraid.net.plg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ exit 0
198198
199199
if [ "$is_7_2_or_higher" = true ]; then
200200
echo "Unraid 7.2+ detected. Using safe removal method."
201-
/etc/rc.d/rc.unraid-api plugins remove unraid-api-plugin-connect -b --no-restart
201+
/etc/rc.d/rc.unraid-api plugins remove unraid-api-plugin-connect -b
202202
203203
# Send notification to user
204204
/usr/local/emhttp/webGui/scripts/notify \

0 commit comments

Comments
 (0)