CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-02 10:54:44 +12:00
Code Issues Projects Releases Wiki Activity

updating checks for both user and pass

Browse source
This commit is contained in:
Damodar Lohani 2021-02-01 12:06:42 +05:45
parent 26500f82ef
commit 7ac826b355
10 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/init.php
View file

@ -92,7 +92,7 @@ Config::load('storage-outputs', __DIR__.'/config/storage/outputs.php');
$user = App::getEnv('_APP_REDIS_USER','');
$pass = App::getEnv('_APP_REDIS_PASS','');
if(!empty($pass)) {
if(!empty($user) || !empty($pass)) {
Resque::setBackend('redis://'.$user.':'.$pass.'@'.App::getEnv('_APP_REDIS_HOST', '').':'.App::getEnv('_APP_REDIS_PORT', ''));
} else {
Resque::setBackend(App::getEnv('_APP_REDIS_HOST', '').':'.App::getEnv('_APP_REDIS_PORT', ''));
@ -179,14 +179,17 @@ $register->set('statsd', function () { // Register DB connection
$register->set('cache', function () { // Register cache connection
$redis = new Redis();
$redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
$user = App::getEnv('_APP_REDIS_USER','') ?? '';
$pass = App::getEnv('_APP_REDIS_PASS','') ?? '';
$user = App::getEnv('_APP_REDIS_USER','');
$pass = App::getEnv('_APP_REDIS_PASS','');
$auth = [];
if(!empty($user)) {
$auth["user"] = $user;
}
if(!empty($pass)) {
if(!empty(trim($user))) {
$redis->auth([$user,$pass]);
}else{
$redis->auth([$pass]);
}
$auth["pass"] = $pass;
}
if(!empty($auth)) {
$redis->auth($auth);
}
$redis->setOption(Redis::OPT_READ_TIMEOUT, -1);

2
bin/schedule
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-audits
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-certificates
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-deletes
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-functions
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-mails
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-tasks
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-usage
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else

2
bin/worker-webhooks
View file

@ -1,6 +1,6 @@
#!/bin/sh
if [ -z "$_APP_REDIS_PASS" ]
if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
then
REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
else