Skip to content

Commit

Permalink
Move memcached back in.
Browse files Browse the repository at this point in the history
  • Loading branch information
csev committed Feb 25, 2024
1 parent c22b2aa commit cd8d2a5
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 15 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

"nesbot/carbon" : "2.68.1",

"tsugi/lib": "dev-master#715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
"tsugi/lib": "dev-master#a31404f87efd9c134f72c6197c0514c162993c57",
"koseu/lib": "dev-master#70c7ac1ca413c2dd541e078ebe07719405621b1b"
},
"config": {
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7511,12 +7511,12 @@
"source": {
"type": "git",
"url": "https://github.com/tsugiproject/tsugi-php.git",
"reference": "715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc"
"reference": "a31404f87efd9c134f72c6197c0514c162993c57"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
"reference": "715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc",
"url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/a31404f87efd9c134f72c6197c0514c162993c57",
"reference": "a31404f87efd9c134f72c6197c0514c162993c57",
"shasum": ""
},
"require": {
Expand Down
6 changes: 3 additions & 3 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '770e466467c7313153a101a2593a8d45f610e61c',
'reference' => 'c22b2aaa016a624cbf74950754f46b13a00ddb7e',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '770e466467c7313153a101a2593a8d45f610e61c',
'reference' => 'c22b2aaa016a624cbf74950754f46b13a00ddb7e',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -1045,7 +1045,7 @@
'tsugi/lib' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '715bb90cc5913b7907f7a7e15dc71a52bfd8b4cc',
'reference' => 'a31404f87efd9c134f72c6197c0514c162993c57',
'type' => 'library',
'install_path' => __DIR__ . '/../tsugi/lib',
'aliases' => array(
Expand Down
37 changes: 33 additions & 4 deletions vendor/tsugi/lib/src/Config/ConfigInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,46 @@ class ConfigInfo {
/**
* Support memcache for session caching
*
* Store sessions in memcache - this seems like the fastest, best, and simplest approach
* when running on AWS.
* Memcache is php-only and so is likely to require less overall dependencies.
*
* http://php.net/manual/en/memcached.sessions.php
* http://php.net/manual/en/memcache.sessions.php
*
* Installed on Ubuntu using
*
* apt-get install -y php${TSUGI_PHP_VERSION}-memcache
*
* Note - prefer "memcache" over "memcached"
* You should only select one of memcache and memcached
*
* $CFG->memcache = 'tcp://memcache-tsugi.4984vw.cfg.use2.cache.amazonaws.com:11211';
*
* In addition to setting this variable, your config.php must include the code
* to configure the PHP session save handler as shown in config-dist.php
*
*/
public $memcache;

/**
* Support memcached for session caching
*
* Memcached is a combination of PHP and C and so may require extra dependencies.
*
* http://php.net/manual/en/memcached.sessions.php
*
* Installed on Ubuntu using
*
* apt-get install -y php${TSUGI_PHP_VERSION}-memcached
*
* You should only select one of memcache and memcached
*
* $CFG->memcached = 'memcache-tsugi.4984vw.cfg.use2.cache.amazonaws.com:11211';
*
* Note no "tcp://" for the memcached version of the url
*
* In addition to setting this variable, your config.php must include the code
* to configure the PHP session save handler as shown in config-dist.php
*/
public $memcached;

/**
* Adding in support for using Redis for session caching.
*
Expand Down

0 comments on commit cd8d2a5

Please sign in to comment.