Fix vars exception, change cachedoc usage,

This commit is contained in:
Bradley Schofield
2022-08-13 20:18:48 +01:00
parent cb87c248d5
commit 237f5264d9
4 changed files with 6 additions and 44 deletions
+2 -6
View File
@@ -145,9 +145,7 @@ class BuildsV1 extends Worker
$source = $deployment->getAttribute('path');
$vars = [];
$variables = $dbForProject->find('variables', [
new Query('functionInternalId', Query::TYPE_EQUAL, [$function->getInternalId()])
], 5000);
$variables = $function['vars'];
foreach ($variables as $variable) {
$vars[$variable['key']] = $variable['value'];
@@ -187,8 +185,7 @@ class BuildsV1 extends Worker
/** Set auto deploy */
if ($deployment->getAttribute('activate') === true) {
$function->setAttribute('deployment', $deployment->getId());
$function = $dbForProject->updateDocument('functions', $function->getId(), $function);
$dbForProject->deleteCachedDocument('functions', $function->getId());
$function = $dbForProject->updateDocument('functions', $function->getId(), $function);
}
/** Update function schedule */
@@ -197,7 +194,6 @@ class BuildsV1 extends Worker
$next = (empty($function->getAttribute('deployment')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : 0;
$function->setAttribute('scheduleNext', (int)$next);
$function = $dbForProject->updateDocument('functions', $function->getId(), $function);
$dbForProject->deleteCachedDocument('functions', $function->getId());
} catch (\Throwable $th) {
$endtime = \time();
$build->setAttribute('endTime', $endtime);
+1 -3
View File
@@ -260,9 +260,7 @@ class FunctionsV1 extends Worker
$vars = [];
$variables = $dbForProject->find('variables', [
new Query('functionInternalId', Query::TYPE_EQUAL, [$function->getInternalId()]),
], APP_LIMIT_COUNT);
$variables = $function['vars'];
foreach ($variables as $variable) {
$vars[$variable['key']] = $variable['value'];