Merge pull request #475 from monarc-project/feature/background-import

Feature / Background Import
pull/483/head
Ruslan Baidan 2023-02-07 14:58:38 +01:00 committed by GitHub
commit d02c121468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 11 deletions

4
.gitignore vendored
View File

@ -1,4 +1,3 @@
nbproject
._* ._*
.buildpath .buildpath
.DS_Store .DS_Store
@ -8,7 +7,6 @@ nbproject
*.cache *.cache
migrations migrations
!tests/migrations !tests/migrations
*.sublime-*
vagrant/.vagrant/ vagrant/.vagrant/
vagrant/*.log vagrant/*.log
vendor/ vendor/
@ -22,4 +20,6 @@ module/
npm-debug.log npm-debug.log
node_modules/ node_modules/
bin/ bin/
!data/import/files/.gitkeep
data/* data/*
.docker/mariaDb/data/*

20
composer.lock generated
View File

@ -1086,16 +1086,16 @@
}, },
{ {
"name": "doctrine/doctrine-laminas-hydrator", "name": "doctrine/doctrine-laminas-hydrator",
"version": "3.2.0", "version": "3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/doctrine-laminas-hydrator.git", "url": "https://github.com/doctrine/doctrine-laminas-hydrator.git",
"reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba" "reference": "84610892fb75584e9c85724b3032f5826b833b69"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba", "url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/84610892fb75584e9c85724b3032f5826b833b69",
"reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba", "reference": "84610892fb75584e9c85724b3032f5826b833b69",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1148,7 +1148,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-11-18T09:49:57+00:00" "time": "2023-02-06T09:18:11+00:00"
}, },
{ {
"name": "doctrine/doctrine-module", "name": "doctrine/doctrine-module",
@ -8058,12 +8058,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "92f4424ad5419a427f950f7d1df1aae30b02687d" "reference": "90538aab13dced1209eb1b30e169308fea0fd783"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/92f4424ad5419a427f950f7d1df1aae30b02687d", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/90538aab13dced1209eb1b30e169308fea0fd783",
"reference": "92f4424ad5419a427f950f7d1df1aae30b02687d", "reference": "90538aab13dced1209eb1b30e169308fea0fd783",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -8087,6 +8087,7 @@
"arc/web": "<3", "arc/web": "<3",
"area17/twill": "<1.2.5|>=2,<2.5.3", "area17/twill": "<1.2.5|>=2,<2.5.3",
"asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
"automad/automad": "<1.8",
"awesome-support/awesome-support": "<=6.0.7", "awesome-support/awesome-support": "<=6.0.7",
"aws/aws-sdk-php": ">=3,<3.2.1", "aws/aws-sdk-php": ">=3,<3.2.1",
"backdrop/backdrop": "<=1.23", "backdrop/backdrop": "<=1.23",
@ -8451,6 +8452,7 @@
"sukohi/surpass": "<1", "sukohi/surpass": "<1",
"sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8", "sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8",
"sumocoders/framework-user-bundle": "<1.4", "sumocoders/framework-user-bundle": "<1.4",
"swag/paypal": "<5.4.4",
"swiftmailer/swiftmailer": ">=4,<5.4.5", "swiftmailer/swiftmailer": ">=4,<5.4.5",
"sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
"sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
@ -8620,7 +8622,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-02-03T01:33:09+00:00" "time": "2023-02-04T01:32:15+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",

View File

@ -10,6 +10,9 @@
* in ZendSkeletonApplication. This is a good practice, as it prevents sensitive * in ZendSkeletonApplication. This is a good practice, as it prevents sensitive
* credentials from accidentally being committed into version control. * credentials from accidentally being committed into version control.
*/ */
$appdir = getenv('APP_DIR') ?: '/var/lib/monarc';
$package_json = json_decode(file_get_contents('./package.json'), true); $package_json = json_decode(file_get_contents('./package.json'), true);
return [ return [
@ -113,4 +116,9 @@ return [
'baseUrl' => 'http://127.0.0.1:5005', 'baseUrl' => 'http://127.0.0.1:5005',
'apiKey' => '', 'apiKey' => '',
], ],
'import' => [
'uploadFolder' => $appdir . '/data/import/files',
'isBackgroundProcessActive' => false,
],
]; ];

View File

View File

@ -0,0 +1,19 @@
#! /usr/bin/env bash
# local use:
#for conf_file_path in /home/vagrant/monarc/config/*/local.php
for conf_file_path in /var/www/*/local.php
do
config_path=$(dirname "$conf_file_path")
export APP_CONF_DIR=$config_path
echo "[$(date)] Import analyses for: $config_path."
# local use:
#./bin/console monarc:import-analyses >> data/background_import.log
/var/lib/monarc/fo/bin/console monarc:import-analyses >> "$config_path"/data/background_import.log
echo "[$(date)] Finished."
done