uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

console results fix

Browse Source
This commit is contained in:
Radu Ioan Fericean
2014-05-12 18:44:22 +03:00
parent 0bfd104e12
commit ec66859d34
20 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/cgr-console/cgr-console.go
View File

@@ -86,9 +86,10 @@ func executeCommand(command string) {
//log.Printf("Param: %+v", param)
if rpcErr := client.Call(cmd.RpcMethod(), param, res); rpcErr != nil {
fmt.Println("Error executing command: " + rpcErr.Error())
} else {
result, _ := json.MarshalIndent(res, "", " ")
fmt.Println(string(result))
}
result, _ := json.MarshalIndent(res, "", " ")
fmt.Println(string(result))
}
func main() {

3
console/account.go
View File

@@ -38,7 +38,6 @@ type CmdGetAccount struct {
name string
rpcMethod string
rpcParams *apier.AttrGetAccount
rpcResult engine.Account
*CommandExecuter
}
@@ -58,5 +57,5 @@ func (self *CmdGetAccount) RpcParams() interface{} {
}
func (self *CmdGetAccount) RpcResult() interface{} {
return &self.rpcResult
return &engine.Account{}
}

4
console/account_add.go
View File

@@ -34,7 +34,6 @@ type CmdAddAccount struct {
name string
rpcMethod string
rpcParams *apier.AttrSetAccount
rpcResult string
*CommandExecuter
}
@@ -54,5 +53,6 @@ func (self *CmdAddAccount) RpcParams() interface{} {
}
func (self *CmdAddAccount) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

4
console/accountactions_set.go
View File

@@ -34,7 +34,6 @@ type CmdSetAccountActions struct {
name string
rpcMethod string
rpcParams *utils.TPAccountActions
rpcResult string
*CommandExecuter
}
@@ -54,5 +53,6 @@ func (self *CmdSetAccountActions) RpcParams() interface{} {
}
func (self *CmdSetAccountActions) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

4
console/action_execute.go
View File

@@ -35,7 +35,6 @@ type CmdExecuteAction struct {
name string
rpcMethod string
rpcParams *apier.AttrExecuteAction
rpcResult string
*CommandExecuter
}
@@ -55,5 +54,6 @@ func (self *CmdExecuteAction) RpcParams() interface{} {
}
func (self *CmdExecuteAction) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

6
console/balance_add.go
View File

@@ -37,7 +37,6 @@ type CmdAddBalance struct {
name string
rpcMethod string
rpcParams *apier.AttrAddBalance
rpcResult string
*CommandExecuter
}
@@ -50,12 +49,13 @@ func (self *CmdAddBalance) RpcMethod() string {
}
func (self *CmdAddBalance) RpcParams() interface{} {
if self.rpcParams == nil {
if self.rpcParams == nil {
self.rpcParams = &apier.AttrAddBalance{BalanceType: engine.CREDIT}
}
return self.rpcParams
}
func (self *CmdAddBalance) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

6
console/balance_debit.go
View File

@@ -36,7 +36,6 @@ type CmdDebitBalance struct {
name string
rpcMethod string
rpcParams *engine.CallDescriptor
rpcResult string
clientArgs []string
*CommandExecuter
}
@@ -50,14 +49,15 @@ func (self *CmdDebitBalance) RpcMethod() string {
}
func (self *CmdDebitBalance) RpcParams() interface{} {
if self.rpcParams == nil {
if self.rpcParams == nil {
self.rpcParams = &engine.CallDescriptor{Direction: "*out"}
}
return self.rpcParams
}
func (self *CmdDebitBalance) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}
func (self *CmdDebitBalance) ClientArgs() []string {

3
console/cache_age.go
View File

@@ -34,7 +34,6 @@ type CmdGetCacheAge struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcResult utils.CachedItemAge
*CommandExecuter
}
@@ -54,5 +53,5 @@ func (self *CmdGetCacheAge) RpcParams() interface{} {
}
func (self *CmdGetCacheAge) RpcResult() interface{} {
return &self.rpcResult
return &utils.CachedItemAge{}
}

3
console/cache_reload.go
View File

@@ -54,5 +54,6 @@ func (self *CmdReloadCache) RpcParams() interface{} {
}
func (self *CmdReloadCache) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

3
console/cache_stats.go
View File

@@ -34,7 +34,6 @@ type CmdGetCacheStats struct {
name string
rpcMethod string
rpcParams *utils.AttrCacheStats
rpcResult utils.CacheStats
*CommandExecuter
}
@@ -54,5 +53,5 @@ func (self *CmdGetCacheStats) RpcParams() interface{} {
}
func (self *CmdGetCacheStats) RpcResult() interface{} {
return &self.rpcResult
return &utils.CacheStats{}
}

3
console/callcost.go
View File

@@ -57,5 +57,6 @@ func (self *CmdGetCallCost) RpcParams() interface{} {
}
func (self *CmdGetCallCost) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

3
console/cdrs_export.go
View File

@@ -34,7 +34,6 @@ type CmdExportCdrs struct {
name string
rpcMethod string
rpcParams *utils.AttrExpFileCdrs
rpcResult utils.ExportedFileCdrs
*CommandExecuter
}
@@ -54,5 +53,5 @@ func (self *CmdExportCdrs) RpcParams() interface{} {
}
func (self *CmdExportCdrs) RpcResult() interface{} {
return &self.rpcResult
return &utils.ExportedFileCdrs{}
}

4
console/cdrs_rem.go
View File

@@ -34,7 +34,6 @@ type CmdRemCdrs struct {
name string
rpcMethod string
rpcParams *utils.AttrRemCdrs
rpcResult string
*CommandExecuter
}
@@ -54,5 +53,6 @@ func (self *CmdRemCdrs) RpcParams() interface{} {
}
func (self *CmdRemCdrs) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

5
console/cost.go
View File

@@ -24,7 +24,7 @@ func init() {
c := &CmdGetCost{
name: "cost",
rpcMethod: "Responder.GetCost",
clientArgs: []string{"Direction", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject"},
clientArgs: []string{"Direction", "Category", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject"},
}
commands[c.Name()] = c
c.CommandExecuter = &CommandExecuter{c}
@@ -35,7 +35,6 @@ type CmdGetCost struct {
name string
rpcMethod string
rpcParams *engine.CallDescriptor
rpcResult engine.CallCost
clientArgs []string
*CommandExecuter
}
@@ -56,7 +55,7 @@ func (self *CmdGetCost) RpcParams() interface{} {
}
func (self *CmdGetCost) RpcResult() interface{} {
return &self.rpcResult
return &engine.CallCost{}
}
func (self *CmdGetCost) ClientArgs() []string {

3
console/destination.go
View File

@@ -34,7 +34,6 @@ type CmdGetDestination struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcResult engine.Destination
*CommandExecuter
}
@@ -54,5 +53,5 @@ func (self *CmdGetDestination) RpcParams() interface{} {
}
func (self *CmdGetDestination) RpcResult() interface{} {
return &self.rpcResult
return &engine.Destination{}
}

4
console/maxduration.go
View File

@@ -35,7 +35,6 @@ type CmdGetMaxDuration struct {
name string
rpcMethod string
rpcParams *engine.CallDescriptor
rpcResult *float64
clientArgs []string
*CommandExecuter
}
@@ -56,7 +55,8 @@ func (self *CmdGetMaxDuration) RpcParams() interface{} {
}
func (self *CmdGetMaxDuration) RpcResult() interface{} {
return &self.rpcResult
var f float64
return &f
}
func (self *CmdGetMaxDuration) ClientArgs() []string {

3
console/ratingprofile_set.go
View File

@@ -54,5 +54,6 @@ func (self *CmdSetRatingProfile) RpcParams() interface{} {
}
func (self *CmdSetRatingProfile) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

4
console/scheduler_reload.go
View File

@@ -32,7 +32,6 @@ type CmdReloadScheduler struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcResult string
*CommandExecuter
}
@@ -52,5 +51,6 @@ func (self *CmdReloadScheduler) RpcParams() interface{} {
}
func (self *CmdReloadScheduler) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}

4
console/status.go
View File

@@ -31,7 +31,6 @@ type CmdStatus struct {
name string
rpcMethod string
rpcParams *StringWrapper
rpcResult string
*CommandExecuter
}
@@ -51,7 +50,8 @@ func (self *CmdStatus) RpcParams() interface{} {
}
func (self *CmdStatus) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}
func (self *CmdStatus) ClientArgs() (args []string) {

4
console/triggeredaction_add.go
View File

@@ -34,7 +34,6 @@ type CmdAddTriggeredAction struct {
name string
rpcMethod string
rpcParams *apier.AttrAddActionTrigger
rpcResult string
*CommandExecuter
}
@@ -54,5 +53,6 @@ func (self *CmdAddTriggeredAction) RpcParams() interface{} {
}
func (self *CmdAddTriggeredAction) RpcResult() interface{} {
return &self.rpcResult
var s string
return &s
}