From 62511ee9e34979b79eb247bd78025bf0cb5bd1f5 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 11:36:09 +0300 Subject: [PATCH 1/8] removed name from cdr and it should compile on go1.0.x now --- cdrs/cdrs.go | 30 ++++++++++++++++-------------- cdrs/fscdr.go | 7 +------ cmd/cgr-rater/cgr-rater.go | 2 +- rater/cdr.go | 1 - 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/cdrs/cdrs.go b/cdrs/cdrs.go index f5ee379eb..e2cb0ab5a 100644 --- a/cdrs/cdrs.go +++ b/cdrs/cdrs.go @@ -20,40 +20,42 @@ package cdrs import ( "fmt" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/mediator" "github.com/cgrates/cgrates/rater" - "github.com/cgrates/cgrates/config" "io/ioutil" "net/http" ) var ( - Logger = rater.Logger - cfg *config.CGRConfig // Share the configuration with the rest of the package + Logger = rater.Logger + cfg *config.CGRConfig // Share the configuration with the rest of the package + storage rater.DataStorage + medi *mediator.Mediator ) -type CDRS struct { - loggerDb rater.DataStorage - medi *mediator.Mediator -} - -func (cdrs *CDRS) cdrHandler(w http.ResponseWriter, r *http.Request) { +func cdrHandler(w http.ResponseWriter, r *http.Request) { body, _ := ioutil.ReadAll(r.Body) if fsCdr, err := new(FSCdr).New(body); err == nil { - cdrs.loggerDb.SetCdr(fsCdr) - cdrs.medi.MediateCdrFromDB(fsCdr.GetAccount(), cdrs.loggerDb) + storage.SetCdr(fsCdr) + medi.MediateCdrFromDB(fsCdr.GetAccount(), storage) } else { Logger.Err(fmt.Sprintf("Could not create CDR entry: %v", err)) } } -func New(storage rater.DataStorage, mediator *mediator.Mediator) *CDRS { - return &CDRS{storage, mediator} +type CDRS struct{} + +func New(s rater.DataStorage, m *mediator.Mediator, c *config.CGRConfig) *CDRS { + storage = s + medi = m + cfg = c + return &CDRS{} } func (cdrs *CDRS) StartCapturingCDRs() { if cfg.CDRSfsJSONEnabled { - http.HandleFunc("/freeswitch_json", cdrs.cdrHandler) + http.HandleFunc("/freeswitch_json", cdrHandler) } http.ListenAndServe(cfg.CDRSListen, nil) } diff --git a/cdrs/fscdr.go b/cdrs/fscdr.go index 4672d3867..66717d6d4 100644 --- a/cdrs/fscdr.go +++ b/cdrs/fscdr.go @@ -26,7 +26,6 @@ import ( "time" ) - const ( // Freswitch event property names CDR_MAP = "variables" @@ -43,9 +42,8 @@ const ( PARK_TIME = "start_stamp" START_TIME = "answer_stamp" END_TIME = "end_stamp" - NAME = "unused" USERNAME = "user_name" - FS_IP = "sip_local_network_addr" + FS_IP = "sip_local_network_addr" ) type FSCdr map[string]string @@ -67,9 +65,6 @@ func (fsCdr FSCdr) New(body []byte) (rater.CDR, error) { return nil, err } -func (fsCdr FSCdr) GetName() string { - return fsCdr[NAME] -} func (fsCdr FSCdr) GetDirection() string { //TODO: implement direction return "OUT" diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go index 480b8773c..fef0a7a89 100644 --- a/cmd/cgr-rater/cgr-rater.go +++ b/cmd/cgr-rater/cgr-rater.go @@ -320,7 +320,7 @@ func main() { if cfg.CDRServerEnabled { rater.Logger.Info("Starting CGRateS CDR Server.") - cs := cdrs.New(loggerDb, medi) + cs := cdrs.New(loggerDb, medi, cfg) go cs.StartCapturingCDRs() } <-exitChan diff --git a/rater/cdr.go b/rater/cdr.go index 0424db5d2..db2d2b106 100644 --- a/rater/cdr.go +++ b/rater/cdr.go @@ -24,7 +24,6 @@ import ( type CDR interface { New([]byte) (CDR, error) - GetName() string GetDirection() string GetOrigId() string GetSubject() string From 913f28a5f6a8a175129d8ba45cfc568a592b0127 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:05:38 +0300 Subject: [PATCH 2/8] test travis --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f381edf3a..f366800ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: go -before_install: sudo apt-get -q install bzr - branches: only: master @@ -15,5 +13,4 @@ notifications: on_success: change on_failure: always -after_script: - ./build.sh && ./test.sh + From ef8e2f32b3ed10e79043ad7d95e91dd38da57bbe Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:10:24 +0300 Subject: [PATCH 3/8] more travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f366800ca..2c200e15c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: go +script: ./test.sh + branches: only: master @@ -13,4 +15,3 @@ notifications: on_success: change on_failure: always - From d1af53fb1be3cd99258884dc69e10191335f3cd7 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:29:26 +0300 Subject: [PATCH 4/8] intentional test fail to test ci --- .travis.yml | 2 +- utils/utils_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c200e15c..2a92eb3bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -script: ./test.sh +script: test.sh branches: only: master diff --git a/utils/utils_test.go b/utils/utils_test.go index b7fc82cda..00e3eb26d 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -28,7 +28,7 @@ func TestFirstNonEmpty(t *testing.T) { sampleMap["Third"] = "third" fourthElmnt := "fourth" winnerElmnt := FirstNonEmpty(firstElmnt, sampleMap["second"], sampleMap["Third"], fourthElmnt) - if winnerElmnt != sampleMap["Third"] { + if winnerElmnt == sampleMap["Third"] { t.Error("Wrong elemnt returned: ", winnerElmnt) } } From 0e856b7d8012e86479c4fb49d8713753cfca156f Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:35:35 +0300 Subject: [PATCH 5/8] switched to drone.io --- README.md | 2 +- utils/utils_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d28c9089..ae0760b23 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ API reference http://gopkgdoc.appspot.com/pkg/github.com/cgrates/cgrates Also check irc.freenode.net#cgrates and [Google group](https://groups.google.com/forum/#!forum/cgrates) for a more real-time support. -Continous integration: [![Build Status](https://goci.herokuapp.com/project/image/github.com/cgrates/cgrates "Continous integration")](http://goci.me/project/github.com/cgrates/cgrates) [![Build Status](https://secure.travis-ci.org/cgrates/cgrates.png)](http://travis-ci.org/cgrates/cgrates) +[![Build Status](https://drone.io/github.com/cgrates/cgrates/status.png)](https://drone.io/github.com/cgrates/cgrates/latest) \ No newline at end of file diff --git a/utils/utils_test.go b/utils/utils_test.go index 00e3eb26d..b7fc82cda 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -28,7 +28,7 @@ func TestFirstNonEmpty(t *testing.T) { sampleMap["Third"] = "third" fourthElmnt := "fourth" winnerElmnt := FirstNonEmpty(firstElmnt, sampleMap["second"], sampleMap["Third"], fourthElmnt) - if winnerElmnt == sampleMap["Third"] { + if winnerElmnt != sampleMap["Third"] { t.Error("Wrong elemnt returned: ", winnerElmnt) } } From d8194b95cf4e65c9e1b0c4579f99ad4e0a51bd39 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:37:40 +0300 Subject: [PATCH 6/8] travis last try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a92eb3bb..db48ada46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -script: test.sh +script: $TRAVIS_BUILD_DIR/test.sh branches: only: master From a68fc52891c98ee7a63a844088db4c2ab72ba385 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:39:14 +0300 Subject: [PATCH 7/8] please travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db48ada46..3568ba1e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -script: $TRAVIS_BUILD_DIR/test.sh +script: $GOPATH/src/github.com/cgrates/cgrates/test.sh branches: only: master From 12d7312853a07947416b9f706273658ea6fb3a69 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 23 May 2013 12:42:32 +0300 Subject: [PATCH 8/8] travis is back --- .travis.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3568ba1e2..db48ada46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -script: $GOPATH/src/github.com/cgrates/cgrates/test.sh +script: $TRAVIS_BUILD_DIR/test.sh branches: only: master diff --git a/README.md b/README.md index ae0760b23..bdbf5b56d 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ API reference http://gopkgdoc.appspot.com/pkg/github.com/cgrates/cgrates Also check irc.freenode.net#cgrates and [Google group](https://groups.google.com/forum/#!forum/cgrates) for a more real-time support. -[![Build Status](https://drone.io/github.com/cgrates/cgrates/status.png)](https://drone.io/github.com/cgrates/cgrates/latest) \ No newline at end of file +[![Build Status](https://drone.io/github.com/cgrates/cgrates/status.png)](https://drone.io/github.com/cgrates/cgrates/latest) [![Build Status](https://secure.travis-ci.org/cgrates/cgrates.png)](http://travis-ci.org/cgrates/cgrates) \ No newline at end of file