Microservices/skel-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vari fix

Browse Source
This commit is contained in:
r.didato
2020-09-25 20:30:09 +02:00
parent d1f4f4c50c
commit 530fc29cd4
11 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+6
View File
@@ -0,0 +1,6 @@
{
"intelephense.environment.includePaths": [
"${workspaceRoot}",
"/home/rik/workspace-php/kube/asdphpKube"
]
}
app/os/opcache.template.ini
+1 -2
View File
@@ -6,7 +6,6 @@ opcache.interned_strings_buffer=16
opcache.max_accelerated_files=10000 opcache.max_accelerated_files=10000
opcache.revalidate_freq=360 opcache.revalidate_freq=360
opcache.validate_timestamps=0 opcache.validate_timestamps=0
opcache.preload=/var/www/§PROJECT_BUILDNAME§/load.php opcache.preload=/home/asdynamics/private/§PROJECT_BUILDNAME§/load.php
opcache.preload_user=www-data opcache.preload_user=www-data
;opcache.blacklist_filename=/var/www/contents-manager-service/index.php
opcache.fast_shutdown=1 opcache.fast_shutdown=1
app/os/worker-entrypoint
+9
View File
@@ -6,6 +6,15 @@ function exit_func {
} }
trap exit_func SIGTERM SIGINT trap exit_func SIGTERM SIGINT
printenv | grep "ASD_" >> /etc/environment
chown -R www-data:www-data /var/log/asdynamics
chown -R www-data:www-data /home/asdynamics/storage
mkdir -p /tmp/asdynamics
chown -R www-data:www-data /tmp/asdynamics
docker-php-entrypoint
ASD_BINDIR="/home/asdynamics/private/${ASD_BUILDNAME}/bin" ASD_BINDIR="/home/asdynamics/private/${ASD_BUILDNAME}/bin"
$ASD_BINDIR/ensureConstraints.php $ASD_BINDIR/ensureConstraints.php
app/private/common/config.php
+7
View File
@@ -13,6 +13,13 @@ Context::setCurrentLocale("gui","en");
Context::setCurrentLocale("system","en"); Context::setCurrentLocale("system","en");
Context::setCurrentLocale("api","en"); Context::setCurrentLocale("api","en");
// %% LOGS
$logPath = Context::getEnvironment()->getDirectoryPath("log");
Context::getEnvironment()->addFilePath("log.job", $logPath."/job.log");
// %% FS Exchange Files
Context::getEnvironment()->addDirectoryPath("comunication", "/jobComunication"); Context::getEnvironment()->addDirectoryPath("comunication", "/jobComunication");
Context::getEnvironment()->addFilePath("comunication.shutdown", Context::getEnvironment()->getDirectoryPath("comunication")."/shutdown" ); Context::getEnvironment()->addFilePath("comunication.shutdown", Context::getEnvironment()->getDirectoryPath("comunication")."/shutdown" );
Context::getEnvironment()->addFilePath("comunication.execution", Context::getEnvironment()->getDirectoryPath("comunication")."/execution" ); Context::getEnvironment()->addFilePath("comunication.execution", Context::getEnvironment()->getDirectoryPath("comunication")."/execution" );
app/private/lib/fileSystem/lib.config.php
+2
View File
@@ -18,5 +18,7 @@ FileSystemManager::addRuleset(Context::getEnvironment()->getDirectoryPath("stora
// Lettura e scrittura su tmp // Lettura e scrittura su tmp
FileSystemManager::addRuleset(Context::getEnvironment()->getDirectoryPath("tmp"), new FileSystemRuleset(FileSystemRuleset::PERMISSION_READ + FileSystemRuleset::PERMISSION_WRITE)); FileSystemManager::addRuleset(Context::getEnvironment()->getDirectoryPath("tmp"), new FileSystemRuleset(FileSystemRuleset::PERMISSION_READ + FileSystemRuleset::PERMISSION_WRITE));
// Lettura e scrittura filesystem interscambio
FileSystemManager::addRuleset(Context::getEnvironment()->getDirectoryPath("comunication"), new FileSystemRuleset(FileSystemRuleset::PERMISSION_READ + FileSystemRuleset::PERMISSION_WRITE));
?> ?>
app/private/lib/logger/lib.config.php
+2
View File
@@ -15,11 +15,13 @@ use ASD\Log\LogManager;
if (Context::getEnvironment()->get("name") == "local") { if (Context::getEnvironment()->get("name") == "local") {
LogManager::addLogger(new FileLogger("core", Context::getEnvironment()->getFilePath("log.core") , Logger::LEVEL_DEBUG)); LogManager::addLogger(new FileLogger("core", Context::getEnvironment()->getFilePath("log.core") , Logger::LEVEL_DEBUG));
LogManager::addLogger(new FileLogger("dao", Context::getEnvironment()->getFilePath("log.dao"), Logger::LEVEL_DEBUG)); LogManager::addLogger(new FileLogger("dao", Context::getEnvironment()->getFilePath("log.dao"), Logger::LEVEL_DEBUG));
LogManager::addLogger(new FileLogger("job", Context::getEnvironment()->getFilePath("log.job"), Logger::LEVEL_DEBUG));
} }
else { else {
$httpClient = new HttpClient(); $httpClient = new HttpClient();
LogManager::addLogger(new GELFLogger("core", "http://graylog3:12201/gelf", $httpClient, Logger::LEVEL_NOTICE)); LogManager::addLogger(new GELFLogger("core", "http://graylog3:12201/gelf", $httpClient, Logger::LEVEL_NOTICE));
LogManager::addLogger(new GELFLogger("dao", "http://graylog3:12201/gelf", $httpClient, Logger::LEVEL_NOTICE)); LogManager::addLogger(new GELFLogger("dao", "http://graylog3:12201/gelf", $httpClient, Logger::LEVEL_NOTICE));
LogManager::addLogger(new GELFLogger("job", "http://graylog3:12201/gelf", $httpClient, Logger::LEVEL_NOTICE));
} }
app/public/index.php
-20
View File
@@ -1,20 +0,0 @@
<!-- ******************************************
* Author : Riccardo Di Dato
* Created On : Thu Jul 11 2019
* File : notFound.html.html
******************************************* -->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="author" content="Riccardo Di Dato">
<title>Works</title>
</head>
<body>
IT WORKS!
</body>
</html>
app/public/load.php
-8
View File
@@ -1,8 +0,0 @@
<?php
/*
* Cambiare nomeProgetto col buildname del progetto
*/
$buildName = getenv("ASD_BUILDNAME");
require_once ("/home/asdynamics/private/$buildName/load.php");
?>
config
+1 -1
View File
@@ -1,4 +1,4 @@
ASDPHP_VERSION="2.3.0-rev3" ASDPHP_VERSION="2.3.5"
DEBUG_REMOTE_IP="10.0.1.3" DEBUG_REMOTE_IP="10.0.1.3"
DEBUG_REMOTE_PORT="9003" DEBUG_REMOTE_PORT="9003"
localEnv/docker-compose.yml
+2
View File
@@ -19,6 +19,8 @@ services:
- §PROJECT_BUILDNAME§-storage:/home/asdynamics/storage/§PROJECT_BUILDNAME§ - §PROJECT_BUILDNAME§-storage:/home/asdynamics/storage/§PROJECT_BUILDNAME§
- §PROJECT_BUILDNAME§-log:/var/log/asdynamics/ - §PROJECT_BUILDNAME§-log:/var/log/asdynamics/
networks:
db-network:
volumes: volumes:
§PROJECT_BUILDNAME§-storage: §PROJECT_BUILDNAME§-storage:
localEnv/runNotDetached.sh
+1 -1
View File
@@ -13,7 +13,7 @@ cd "/home/asdynamics/dockerenv/$PROJECT_BUILDNAME"
COMPOSER_NAME="local_$PROJECT_BUILDNAME" COMPOSER_NAME="local_$PROJECT_BUILDNAME"
docker-compose -p "$COMPOSER_NAME" up webserver docker-compose -p "$COMPOSER_NAME" up worker
cd "$DIR_RETURN" cd "$DIR_RETURN"
exit 0; exit 0;