chore(storage): убрать неиспользуемый код и стабилизировать деплой
- storage.js: из экспорта убраны неиспользуемые publicPath, localExists и dir - server.js: убран неиспользуемый импорт mimeFor и параметр originalsDir в воркере - worker.js: убран неиспользуемый параметр originalsDir - scripts/deploy.sh: up -d --force-recreate app, чтобы пересобранный образ гарантированно применялся (compose не всегда пересоздаёт контейнер при неизменном конфиге сервиса)
This commit is contained in:
+1
-1
@@ -30,7 +30,7 @@ export GIT_COMMIT GIT_COMMIT_DATE
|
|||||||
echo ">> Сборка: $GIT_COMMIT ($GIT_COMMIT_DATE)"
|
echo ">> Сборка: $GIT_COMMIT ($GIT_COMMIT_DATE)"
|
||||||
|
|
||||||
$DC build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_COMMIT_DATE=$GIT_COMMIT_DATE" app
|
$DC build --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_COMMIT_DATE=$GIT_COMMIT_DATE" app
|
||||||
$DC up -d app
|
$DC up -d --force-recreate app
|
||||||
|
|
||||||
echo ">> Проверка"
|
echo ">> Проверка"
|
||||||
$DC exec -T app cat /app/public/version.json
|
$DC exec -T app cat /app/public/version.json
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const heicConvert = require('heic-convert');
|
|||||||
const { createEntryAutoChecker, createPhotoEnhanceWorker } = require('./worker');
|
const { createEntryAutoChecker, createPhotoEnhanceWorker } = require('./worker');
|
||||||
const { createZipWriter, renderStudentReport } = require('./student-report');
|
const { createZipWriter, renderStudentReport } = require('./student-report');
|
||||||
|
|
||||||
const { createStorage, mimeFor } = require('./storage');
|
const { createStorage } = require('./storage');
|
||||||
|
|
||||||
const https = require('https');
|
const https = require('https');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
@@ -5296,7 +5296,6 @@ if (fs.existsSync(certPath) && fs.existsSync(keyPath)) {
|
|||||||
sharp,
|
sharp,
|
||||||
photoAiUrl: PHOTO_AI_URL,
|
photoAiUrl: PHOTO_AI_URL,
|
||||||
uploadsDir: UPLOADS_DIR,
|
uploadsDir: UPLOADS_DIR,
|
||||||
originalsDir: ORIGINALS_DIR,
|
|
||||||
storage,
|
storage,
|
||||||
});
|
});
|
||||||
photoWorker.start();
|
photoWorker.start();
|
||||||
|
|||||||
@@ -111,11 +111,6 @@ function createStorage(options = {}) {
|
|||||||
return path.join(cacheDir, ...k.split('/'));
|
return path.join(cacheDir, ...k.split('/'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function publicPath(key) {
|
|
||||||
const k = normalizeKey(key);
|
|
||||||
return k ? `/uploads/${k}` : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function keyFromPath(p) {
|
function keyFromPath(p) {
|
||||||
return normalizeKey(p);
|
return normalizeKey(p);
|
||||||
}
|
}
|
||||||
@@ -517,13 +512,10 @@ function createStorage(options = {}) {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
bucket,
|
bucket,
|
||||||
dir,
|
|
||||||
cacheDir,
|
cacheDir,
|
||||||
isRemote,
|
isRemote,
|
||||||
keyFromPath,
|
keyFromPath,
|
||||||
publicPath,
|
|
||||||
localFile,
|
localFile,
|
||||||
localExists,
|
|
||||||
unlinkLocalOnly,
|
unlinkLocalOnly,
|
||||||
normalizeKey,
|
normalizeKey,
|
||||||
put,
|
put,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const crypto = require('crypto');
|
|||||||
const PHOTO_MAX_ATTEMPTS = 3;
|
const PHOTO_MAX_ATTEMPTS = 3;
|
||||||
const PHOTO_AI_TIMEOUT_MS = 300000;
|
const PHOTO_AI_TIMEOUT_MS = 300000;
|
||||||
|
|
||||||
function createPhotoEnhanceWorker({ pool, getSetting, logAudit, invalidateEntries, sharp, photoAiUrl, uploadsDir, originalsDir, storage }) {
|
function createPhotoEnhanceWorker({ pool, getSetting, logAudit, invalidateEntries, sharp, photoAiUrl, uploadsDir, storage }) {
|
||||||
const AI_URL = photoAiUrl || process.env.PHOTO_AI_URL || '';
|
const AI_URL = photoAiUrl || process.env.PHOTO_AI_URL || '';
|
||||||
const IDLE_MIN = 2000;
|
const IDLE_MIN = 2000;
|
||||||
const IDLE_MAX = 30000;
|
const IDLE_MAX = 30000;
|
||||||
|
|||||||
Reference in New Issue
Block a user