diff --git a/.yarnrc.yml b/.yarnrc.yml index 4d9b3cd..f47fde5 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -5,3 +5,4 @@ nodeLinker: node-modules pnpMode: loose +pnpEnableInlining: true diff --git a/deployment/core/tasks.py b/deployment/core/tasks.py index 9138633..aa5a9cb 100644 --- a/deployment/core/tasks.py +++ b/deployment/core/tasks.py @@ -245,6 +245,7 @@ # Atomic rename of the symlink itself (overwrites the old link) self.sh(f"mv -Tf {temp_link} {deploy_link}", shlex=True) + self.sh("yarn", cwd=final_release_dir) # Restart service self.sh(f"sudo systemctl restart {cfg.service_name}", shlex=True) diff --git a/deployment/lib/task_types.py b/deployment/lib/task_types.py index b640762..cc9886a 100755 --- a/deployment/lib/task_types.py +++ b/deployment/lib/task_types.py @@ -66,13 +66,11 @@ key = Task.get_key(key) return key in Task._registry.keys() - @staticmethod def initialized(key): - """Returns the initialized object""" - key = Task.get_key(key) - return key in Task._completed.keys() - + """Returns the initialized object""" + key = Task.get_key(key) + return key in Task._completed.keys() # 3. Run the task @staticmethod @@ -88,7 +86,7 @@ # 2. Initialize the dependency # This is harmless if already initialized # due to internal checks - task = Task.add(key) # Also provides the object + task = Task.add(key) # Also provides the object # 3. Run the task and store its result print(f"Running task: {key}") @@ -110,9 +108,6 @@ key = Task.get_key(key) return key in Task._completed.keys() - - - @staticmethod def get_owner(): return Task._owner @@ -183,7 +178,6 @@ if attach_printer: self.attach_printer(parent) - def initialize_deps(): for dep in self._deps: dep_name = dep.__name__ @@ -382,7 +376,7 @@ return TaskRunner.is_loaded(self._deps) - def poll_health_endpoint(self, uri, retries=3, delay=2, label="Service"): + def poll_health_endpoint(self, uri, retries=5, delay=5, label="Service"): """Shared polling logic for verifying service availability""" self.print(f" [POLL] Verifying {label} Health: {uri}") diff --git a/package.json b/package.json index cf01491..8004987 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "compression": "^1.8.1", "cookie-parser": "^1.4.7", "csurf": "^1.11.0", - "dotenv": "^17.2.1", + "dotenv": "^17.3.1", "express": "^5.1.0", "express-handlebars": "^8.0.3", "express-list-endpoints": "^7.1.1", diff --git a/src/utils/sqlite3.js b/src/utils/sqlite3.js index 54abb4f..2716f23 100644 --- a/src/utils/sqlite3.js +++ b/src/utils/sqlite3.js @@ -1,5 +1,5 @@ const sqlite3 = require("sqlite3").verbose(); -const { logging } = require("../../config/loader"); +const { logging } = require("../config/loader"); const dbFile = logging.getDBFile("analytic.sqlite3"); const db = new sqlite3.Database(dbFile); diff --git a/yarn.lock b/yarn.lock index 4467555..0a925f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1839,10 +1839,10 @@ languageName: node linkType: hard -"dotenv@npm:^17.2.1": - version: 17.2.1 - resolution: "dotenv@npm:17.2.1" - checksum: 10c0/918dd2f9d8b8f86b0afabad9534793d51de3718c437f9e7b6525628cf68c1d4ae768cc37a5afff38c066f58a8ecf549f4ac6cd5617485bd328e826112cc2650a +"dotenv@npm:^17.3.1": + version: 17.3.1 + resolution: "dotenv@npm:17.3.1" + checksum: 10c0/c78e0c2d5a549c751e544cc60e2b95e7cb67e0c551f42e094d161c6b297aa44b630a3c2dcacf5569e529a6c2a6b84e2ab9be8d37b299d425df5a18b81ce4a35f languageName: node linkType: hard @@ -2121,7 +2121,7 @@ compression: "npm:^1.8.1" cookie-parser: "npm:^1.4.7" csurf: "npm:^1.11.0" - dotenv: "npm:^17.2.1" + dotenv: "npm:^17.3.1" express: "npm:^5.1.0" express-handlebars: "npm:^8.0.3" express-list-endpoints: "npm:^7.1.1"