Correct in/out arguments for cache commands from cgr-console

This commit is contained in:
TeoV
2019-08-05 12:48:23 +03:00
committed by Dan Christian Bogos
parent 12c62a3096
commit e616690c8b
11 changed files with 35 additions and 30 deletions

View File

@@ -26,6 +26,7 @@ func init() {
c := &CmdClear{
name: "cache_clear",
rpcMethod: utils.CacheSv1Clear,
rpcParams: &utils.AttrCacheIDsWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -35,7 +36,7 @@ func init() {
type CmdClear struct {
name string
rpcMethod string
rpcParams *StringSliceWrapper
rpcParams *utils.AttrCacheIDsWithArgDispatcher
*CommandExecuter
}
@@ -49,7 +50,7 @@ func (self *CmdClear) RpcMethod() string {
func (self *CmdClear) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(StringSliceWrapper)
self.rpcParams = new(utils.AttrCacheIDsWithArgDispatcher)
}
return self.rpcParams
}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheGetGroupItemIDs{
name: "cache_group_item_ids",
rpcMethod: utils.CacheSv1GetGroupItemIDs,
rpcParams: &utils.ArgsGetGroup{},
rpcParams: &utils.ArgsGetGroupWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheGetGroupItemIDs struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetGroup
rpcParams *utils.ArgsGetGroupWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheGetGroupItemIDs) RpcMethod() string {
func (self *CmdCacheGetGroupItemIDs) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetGroup{}
self.rpcParams = &utils.ArgsGetGroupWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheHasGroup{
name: "cache_has_group",
rpcMethod: utils.CacheSv1HasGroup,
rpcParams: &utils.ArgsGetGroup{},
rpcParams: &utils.ArgsGetGroupWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheHasGroup struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetGroup
rpcParams *utils.ArgsGetGroupWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheHasGroup) RpcMethod() string {
func (self *CmdCacheHasGroup) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetGroup{}
self.rpcParams = &utils.ArgsGetGroupWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheHasItem{
name: "cache_has_item",
rpcMethod: utils.CacheSv1HasItem,
rpcParams: &utils.ArgsGetCacheItem{},
rpcParams: &utils.ArgsGetCacheItemWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheHasItem struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetCacheItem
rpcParams *utils.ArgsGetCacheItemWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheHasItem) RpcMethod() string {
func (self *CmdCacheHasItem) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetCacheItem{}
self.rpcParams = &utils.ArgsGetCacheItemWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package console
import (
"time"
"github.com/cgrates/cgrates/utils"
)
@@ -26,7 +28,7 @@ func init() {
c := &CmdCacheGetItemExpiryTime{
name: "cache_item_expiry_time",
rpcMethod: utils.CacheSv1GetItemExpiryTime,
rpcParams: &utils.ArgsGetCacheItem{},
rpcParams: &utils.ArgsGetCacheItemWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +38,7 @@ func init() {
type CmdCacheGetItemExpiryTime struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetCacheItem
rpcParams *utils.ArgsGetCacheItemWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +52,7 @@ func (self *CmdCacheGetItemExpiryTime) RpcMethod() string {
func (self *CmdCacheGetItemExpiryTime) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetCacheItem{}
self.rpcParams = &utils.ArgsGetCacheItemWithArgDispatcher{}
}
return self.rpcParams
}
@@ -60,6 +62,6 @@ func (self *CmdCacheGetItemExpiryTime) PostprocessRpcParams() error {
}
func (self *CmdCacheGetItemExpiryTime) RpcResult() interface{} {
var reply string
var reply time.Time
return &reply
}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheGetItemIDs{
name: "cache_item_ids",
rpcMethod: utils.CacheSv1GetItemIDs,
rpcParams: &utils.ArgsGetCacheItemIDs{},
rpcParams: &utils.ArgsGetCacheItemIDsWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheGetItemIDs struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetCacheItemIDs
rpcParams *utils.ArgsGetCacheItemIDsWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheGetItemIDs) RpcMethod() string {
func (self *CmdCacheGetItemIDs) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetCacheItemIDs{}
self.rpcParams = &utils.ArgsGetCacheItemIDsWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -20,13 +20,13 @@ package console
import (
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/ltcache"
)
func init() {
c := &CmdGetPrecacheStatus{
name: "cache_precache_status",
rpcMethod: utils.CacheSv1PrecacheStatus,
rpcParams: &utils.AttrCacheIDsWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdGetPrecacheStatus struct {
name string
rpcMethod string
rpcParams *StringSliceWrapper
rpcParams *utils.AttrCacheIDsWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdGetPrecacheStatus) RpcMethod() string {
func (self *CmdGetPrecacheStatus) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(StringSliceWrapper)
self.rpcParams = new(utils.AttrCacheIDsWithArgDispatcher)
}
return self.rpcParams
}
@@ -60,6 +60,6 @@ func (self *CmdGetPrecacheStatus) PostprocessRpcParams() error {
}
func (self *CmdGetPrecacheStatus) RpcResult() interface{} {
reply := make(map[string]*ltcache.CacheStats)
reply := make(map[string]string)
return &reply
}

View File

@@ -24,6 +24,7 @@ func init() {
c := &CmdReloadCache{
name: "cache_reload",
rpcMethod: utils.CacheSv1ReloadCache,
rpcParams: &utils.AttrReloadCacheWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheRemoveGroup{
name: "cache_remove_group",
rpcMethod: utils.CacheSv1RemoveGroup,
rpcParams: &utils.ArgsGetGroup{},
rpcParams: &utils.ArgsGetGroupWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheRemoveGroup struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetGroup
rpcParams *utils.ArgsGetGroupWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheRemoveGroup) RpcMethod() string {
func (self *CmdCacheRemoveGroup) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetGroup{}
self.rpcParams = &utils.ArgsGetGroupWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -26,7 +26,7 @@ func init() {
c := &CmdCacheRemoveItem{
name: "cache_remove_item",
rpcMethod: utils.CacheSv1RemoveItem,
rpcParams: &utils.ArgsGetCacheItem{},
rpcParams: &utils.ArgsGetCacheItemWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
type CmdCacheRemoveItem struct {
name string
rpcMethod string
rpcParams *utils.ArgsGetCacheItem
rpcParams *utils.ArgsGetCacheItemWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +50,7 @@ func (self *CmdCacheRemoveItem) RpcMethod() string {
func (self *CmdCacheRemoveItem) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = &utils.ArgsGetCacheItem{}
self.rpcParams = &utils.ArgsGetCacheItemWithArgDispatcher{}
}
return self.rpcParams
}

View File

@@ -27,6 +27,7 @@ func init() {
c := &CmdGetCacheStats{
name: "cache_stats",
rpcMethod: utils.CacheSv1GetCacheStats,
rpcParams: &utils.AttrCacheIDsWithArgDispatcher{},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +37,7 @@ func init() {
type CmdGetCacheStats struct {
name string
rpcMethod string
rpcParams *StringSliceWrapper
rpcParams *utils.AttrCacheIDsWithArgDispatcher
*CommandExecuter
}
@@ -50,7 +51,7 @@ func (self *CmdGetCacheStats) RpcMethod() string {
func (self *CmdGetCacheStats) RpcParams(reset bool) interface{} {
if reset || self.rpcParams == nil {
self.rpcParams = new(StringSliceWrapper)
self.rpcParams = new(utils.AttrCacheIDsWithArgDispatcher)
}
return self.rpcParams
}