Updated check for poster configuration

This commit is contained in:
Trial97
2019-07-10 14:45:30 +03:00
committed by Dan Christian Bogos
parent 65b0e0f608
commit a36c914aa7
8 changed files with 41 additions and 25 deletions

View File

@@ -1096,6 +1096,7 @@ func resetAccount(ub *Account, action *Action, acts Actions, _ interface{}) erro
filter := &utils.CDRsFilter{
NotRunIDs: []string{utils.MetaRaw},
Accounts: []string{account},
NotCosts: []float64{-1},
OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.INFIELD_SEP),
Paginator: utils.Paginator{Limit: utils.IntPointer(1)},
}

View File

@@ -39,11 +39,10 @@ const (
exchangeType = "exchange_type"
routingKey = "routing_key"
awsRegion = "aws_region"
awsID = "aws_key"
awsSecret = "aws_secret"
awsToken = "aws_token"
// awsAccountID = "aws_account_id"
//awsRegion = "aws_region"
//awsID = "aws_key"
//awsSecret = "aws_secret"
awsToken = "aws_token"
folderPath = "folder_path"
)

View File

@@ -69,13 +69,13 @@ func (pstr *S3Poster) parseURL(dialURL string) {
if val, has := qry[folderPath]; has {
pstr.folderPath = val
}
if val, has := qry[awsRegion]; has {
if val, has := qry[utils.AWSRegion]; has {
pstr.awsRegion = val
}
if val, has := qry[awsID]; has {
if val, has := qry[utils.AWSKey]; has {
pstr.awsID = val
}
if val, has := qry[awsSecret]; has {
if val, has := qry[utils.AWSSecret]; has {
pstr.awsKey = val
}
if val, has := qry[awsToken]; has {

View File

@@ -67,13 +67,13 @@ func (pstr *SQSPoster) parseURL(dialURL string) {
if val, has := qry[queueID]; has {
pstr.queueID = val
}
if val, has := qry[awsRegion]; has {
if val, has := qry[utils.AWSRegion]; has {
pstr.awsRegion = val
}
if val, has := qry[awsID]; has {
if val, has := qry[utils.AWSKey]; has {
pstr.awsID = val
}
if val, has := qry[awsSecret]; has {
if val, has := qry[utils.AWSSecret]; has {
pstr.awsKey = val
}
if val, has := qry[awsToken]; has {