fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update references to CacheHandler in several modules

Browse source
This commit is contained in:
Kijin Sung 2016-04-18 00:55:29 +09:00
parent 050a507707
commit 2f234dfad1
11 changed files with 39 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/comment/comment.admin.controller.php
View file

@ -436,12 +436,7 @@ class commentAdminController extends comment
$output = executeQuery('comment.deleteModuleCommentsList', $args); $output = executeQuery('comment.deleteModuleCommentsList', $args);
//remove from cache //remove from cache
$oCacheHandler = CacheHandler::getInstance('object'); Rhymix\Framework\Cache::clearGroup('newestCommentsList');
if($oCacheHandler->isSupport())
{
// Invalidate newest comments. Per document cache is invalidated inside document admin controller.
$oCacheHandler->invalidateGroupKey('newestCommentsList');
}
return $output; return $output;
} }

31
modules/counter/counter.model.php
View file

@ -31,13 +31,9 @@ class counterModel extends counter
$args->site_srl = $site_srl; $args->site_srl = $site_srl;
$iplogged = false; $iplogged = false;
$oCacheHandler = CacheHandler::getInstance('object'); $cache_key = 'counter:' . $site_srl . '_' . str_replace(array('.', ':'), '-', $args->ipaddress);
if($oCacheHandler->isSupport()) $group_key = 'counterIpLogged_' . $args->regdate;
{ $iplogged = Rhymix\Framework\Cache::get($cache_key, $group_key);
$object_key = 'counter:' . $site_srl . '_' . str_replace(array('.', ':'), '-', $args->ipaddress);
$cache_key = $oCacheHandler->getGroupKey('counterIpLogged_' . $args->regdate, $object_key);
$iplogged = $oCacheHandler->get($cache_key);
}
if($iplogged === false) if($iplogged === false)
{ {
@ -45,9 +41,9 @@ class counterModel extends counter
if($output->data->count) $iplogged = TRUE; if($output->data->count) $iplogged = TRUE;
} }
if($iplogged && $oCacheHandler->isSupport()) if($iplogged)
{ {
$oCacheHandler->put($cache_key, $iplogged); Rhymix\Framework\Cache::set($cache_key, $iplogged, 0, $group_key);
} }
return $iplogged; return $iplogged;
@ -64,15 +60,10 @@ class counterModel extends counter
$args = new stdClass; $args = new stdClass;
$args->regdate = date('Ymd'); $args->regdate = date('Ymd');
$insertedTodayStatus = false; $cache_key = 'counter:insertedTodayStatus:' . $site_srl . '_' . $args->regdate;
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE); $insertedTodayStatus = Rhymix\Framework\Cache::get($cache_key);
if($oCacheHandler->isSupport())
{
$cache_key = 'counter:insertedTodayStatus:' . $site_srl . '_' . $args->regdate;
$insertedTodayStatus = $oCacheHandler->get($cache_key);
}
if($insertedTodayStatus === false) if(!$insertedTodayStatus)
{ {
if($site_srl) if($site_srl)
{ {
@ -86,11 +77,11 @@ class counterModel extends counter
$insertedTodayStatus = !!$output->data->count; $insertedTodayStatus = !!$output->data->count;
if($insertedTodayStatus && $oCacheHandler->isSupport()) if($insertedTodayStatus)
{ {
$oCacheHandler->put($cache_key, TRUE); Rhymix\Framework\Cache::set($cache_key, true);
$_old_date = date('Ymd', strtotime('-1 day')); $_old_date = date('Ymd', strtotime('-1 day'));
$oCacheHandler->delete('counter:insertedTodayStatus:' . $site_srl . '_' . $_old_date); Rhymix\Framework\Cache::delete('counter:insertedTodayStatus:' . $site_srl . '_' . $_old_date);
} }
} }

6
modules/layout/layout.admin.controller.php
View file

@ -178,11 +178,7 @@ class layoutAdminController extends layout
$output = executeQuery('layout.updateModuleLayout', $update_args); $output = executeQuery('layout.updateModuleLayout', $update_args);
} }
$oCacheHandler = CacheHandler::getInstance('object', null, true); Rhymix\Framework\Cache::clearGroup('site_and_module');
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('site_and_module');
}
} }
} }
} }

6
modules/member/member.admin.controller.php
View file

@ -1330,11 +1330,7 @@ class memberAdminController extends member
function _deleteMemberGroupCache($site_srl = 0) function _deleteMemberGroupCache($site_srl = 0)
{ {
//remove from cache //remove from cache
$oCacheHandler = CacheHandler::getInstance('object', null, true); Rhymix\Framework\Cache::clearGroup('member');
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('member');
}
} }
/** /**

25
modules/member/member.controller.php
View file

@ -2971,27 +2971,12 @@ class memberController extends member
function _clearMemberCache($member_srl, $site_srl = 0) function _clearMemberCache($member_srl, $site_srl = 0)
{ {
$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE); $member_srl = getNumberingPath($member_srl) . $member_srl;
if($oCacheHandler->isSupport()) Rhymix\Framework\Cache::delete("member_info:$member_srl", 'member');
Rhymix\Framework\Cache::delete("member_groups:$member_srl:site:$site_srl", 'member');
if ($site_srl != 0)
{ {
$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_' . $site_srl; Rhymix\Framework\Cache::delete("member_groups:$member_srl:site:0", 'member');
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$oCacheHandler->delete($cache_key);
if($site_srl !== 0)
{
$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$oCacheHandler->delete($cache_key);
}
}
$oCacheHandler = CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
{
$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$oCacheHandler->delete($cache_key);
} }
} }
} }

69
modules/member/member.model.php
View file

@ -326,31 +326,21 @@ class memberModel extends member
//columnList size zero... get full member info //columnList size zero... get full member info
if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0) if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
{ {
$GLOBALS['__member_info__'][$member_srl] = false; $cache_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
$GLOBALS['__member_info__'][$member_srl] = Rhymix\Framework\Cache::get($cache_key, 'member');
$oCacheHandler = CacheHandler::getInstance('object'); if(!$GLOBALS['__member_info__'][$member_srl])
if($oCacheHandler->isSupport())
{
$columnList = array();
$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$GLOBALS['__member_info__'][$member_srl] = $oCacheHandler->get($cache_key);
}
if($GLOBALS['__member_info__'][$member_srl] === false)
{ {
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList); $output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
if(!$output->data) if(!$output->data)
{ {
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass); Rhymix\Framework\Cache::set($cache_key, new stdClass, 0, 'member');
return new stdClass; return new stdClass;
} }
$this->arrangeMemberInfo($output->data, $site_srl); $this->arrangeMemberInfo($output->data, $site_srl);
Rhymix\Framework\Cache::set($cache_key, $GLOBALS['__member_info__'][$member_srl], 0, 'member');
//insert in cache
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
} }
} }
@ -367,7 +357,6 @@ class memberModel extends member
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('member'); $config = $oModuleModel->getModuleConfig('member');
$info->profile_image = $this->getProfileImage($info->member_srl); $info->profile_image = $this->getProfileImage($info->member_srl);
$info->image_name = $this->getImageName($info->member_srl); $info->image_name = $this->getImageName($info->member_srl);
$info->image_mark = $this->getImageMark($info->member_srl); $info->image_mark = $this->getImageMark($info->member_srl);
@ -494,18 +483,12 @@ class memberModel extends member
static $member_groups = array(); static $member_groups = array();
// cache controll // cache controll
$group_list = false; $cache_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . ':site:' . $site_srl;
$oCacheHandler = CacheHandler::getInstance('object', null, true); $group_list = Rhymix\Framework\Cache::get($cache_key, 'member');
if($oCacheHandler->isSupport())
{
$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_'.$site_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$group_list = $oCacheHandler->get($cache_key);
}
if(!$member_groups[$member_srl][$site_srl] || $force_reload) if(!$member_groups[$member_srl][$site_srl] || $force_reload)
{ {
if($group_list === false) if(!$group_list)
{ {
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
@ -513,7 +496,7 @@ class memberModel extends member
$output = executeQueryArray('member.getMemberGroups', $args); $output = executeQueryArray('member.getMemberGroups', $args);
$group_list = $output->data; $group_list = $output->data;
//insert in cache //insert in cache
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list); Rhymix\Framework\Cache::set($cache_key, $group_list, 0, 'member');
} }
if(!$group_list) return array(); if(!$group_list) return array();
@ -550,26 +533,15 @@ class memberModel extends member
*/ */
function getDefaultGroup($site_srl = 0, $columnList = array()) function getDefaultGroup($site_srl = 0, $columnList = array())
{ {
$default_group = false; $default_group = Rhymix\Framework\Cache::get("default_group:$site_srl", 'member');
$oCacheHandler = CacheHandler::getInstance('object', null, true);
if($oCacheHandler->isSupport())
{
$columnList = array();
$object_key = 'default_group_' . $site_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$default_group = $oCacheHandler->get($cache_key);
}
if($default_group === false) if(!$default_group)
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $site_srl; $args->site_srl = $site_srl;
$output = executeQuery('member.getDefaultGroup', $args, $columnList); $output = executeQuery('member.getDefaultGroup', $args, $columnList);
$default_group = $output->data; $default_group = $output->data;
if($oCacheHandler->isSupport()) Rhymix\Framework\Cache::set("default_group:$site_srl", $default_group, 0, 'member');
{
$oCacheHandler->put($cache_key, $default_group);
}
} }
return $default_group; return $default_group;
@ -609,16 +581,9 @@ class memberModel extends member
$site_srl = 0; $site_srl = 0;
} }
$group_list = false; $group_list = Rhymix\Framework\Cache::get("member_groups:site:$site_srl", 'member');
$oCacheHandler = CacheHandler::getInstance('object', null, true);
if($oCacheHandler->isSupport())
{
$object_key = 'member_groups:site_'.$site_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$group_list = $oCacheHandler->get($cache_key);
}
if($group_list === false) if(!$group_list)
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $site_srl; $args->site_srl = $site_srl;
@ -626,8 +591,7 @@ class memberModel extends member
$args->order_type = 'asc'; $args->order_type = 'asc';
$output = executeQueryArray('member.getGroups', $args); $output = executeQueryArray('member.getGroups', $args);
$group_list = $output->data; $group_list = $output->data;
//insert in cache Rhymix\Framework\Cache::set("member_groups:site:$site_srl", $group_list, 0, 'member');
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
} }
if(!$group_list) if(!$group_list)
@ -635,7 +599,6 @@ class memberModel extends member
return array(); return array();
} }
foreach($group_list as $val) foreach($group_list as $val)
{ {
$result[$val->group_srl] = $val; $result[$val->group_srl] = $val;

7
modules/menu/menu.admin.controller.php
View file

@ -209,12 +209,7 @@ class menuAdminController extends menu
return $output; return $output;
} }
$oCacheHandler = CacheHandler::getInstance('object', null, true); Rhymix\Framework\Cache::clearGroup('site_and_module');
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('site_and_module');
}
$oMenuAdminController = getAdminController('menu'); $oMenuAdminController = getAdminController('menu');
$oMenuAdminController->makeXmlFile($menuSrl); $oMenuAdminController->makeXmlFile($menuSrl);

1
modules/ncenterlite/ncenterlite.controller.php
View file

@ -232,7 +232,6 @@ class ncenterliteController extends ncenterlite
if(isset($config->use['mention'])) if(isset($config->use['mention']))
{ {
$mention_targets = $this->_getMentionTarget($content); $mention_targets = $this->_getMentionTarget($content);
debugPrint($mention_targets);
// !TODO 공용 메소드로 분리 // !TODO 공용 메소드로 분리
foreach($mention_targets as $mention_member_srl) foreach($mention_targets as $mention_member_srl)

8
modules/page/page.admin.controller.php
View file

@ -282,13 +282,7 @@ class pageAdminController extends page
} }
} }
$oCacheHandler = CacheHandler::getInstance('object', null, true); Rhymix\Framework\Cache::delete('mid_info:' . $module_info->module_srl, 'site_and_module');
if($oCacheHandler->isSupport())
{
$object_key = 'mid_info:' . $module_info->module_srl;
$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
$oCacheHandler->delete($cache_key);
}
} }
function procPageAdminArticleDocumentInsert() function procPageAdminArticleDocumentInsert()

7
modules/point/point.admin.controller.php
View file

@ -402,12 +402,7 @@ class pointAdminController extends point
executeQuery('module.deleteModulePartConfig', $args); executeQuery('module.deleteModulePartConfig', $args);
} }
$oCacheHandler = CacheHandler::getInstance('object', null, true); Rhymix\Framework\Cache::clearGroup('site_and_module');
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('site_and_module');
}
$this->setMessage('success_updated'); $this->setMessage('success_updated');
} }

16
modules/point/point.controller.php
View file

@ -688,21 +688,7 @@ class pointController extends point
$cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl); $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl);
FileHandler::writeFile($cache_filename, $point); FileHandler::writeFile($cache_filename, $point);
$oCacheHandler = CacheHandler::getInstance('object', null, true); getController('member')->_clearMemberCache($member_srl);
if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
{
$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$oCacheHandler->delete($cache_key);
}
$oCacheHandler = CacheHandler::getInstance('object');
if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
{
$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
$oCacheHandler->delete($cache_key);
}
return $output; return $output;
} }