Commit Graph

4750 Commits

Author SHA1 Message Date
DanB
dedb006d6c Faster ActiveSessionsCount 2016-08-26 15:42:45 +02:00
DanB
cd4fec5167 Better protection for session indexes 2016-08-26 14:43:31 +02:00
DanB
91f152f756 Enable RPC service for SMG alone 2016-08-26 13:06:43 +02:00
DanB
2c55757563 Utility to merge maps 2016-08-26 12:30:48 +02:00
DanB
14c3f988dd ReflectStructAsMap 2016-08-26 09:44:49 +02:00
DanB
3b9756a9b4 Fix RunID in case of default session 2016-08-26 08:51:25 +02:00
DanB
f7ca7b400f SMGeneric.ActiveSessions with indexed filters 2016-08-25 22:20:51 +02:00
DanB
981dbe6f22 Merge branch 'master' of https://github.com/cgrates/cgrates 2016-08-25 09:36:57 +02:00
DanB
8a27dfc4d2 SMG - session indexing implementation with tests 2016-08-25 09:21:32 +02:00
Dan Christian Bogos
fb3ad9df1b Merge pull request #516 from afone-lboue/patch-1
Missing spooldir directories in RPM build script
2016-08-24 17:39:31 +03:00
Dan Christian Bogos
b801fc1a65 Merge pull request #517 from rbarrabe/patch-8
Add function AppendCDR in api
2016-08-24 17:38:11 +03:00
rbarrabe
c3455c77c2 Update cdrstatsv1.go 2016-08-24 15:03:39 +02:00
rbarrabe
4e41b1ede6 Update cdrstatsv1.go 2016-08-24 13:52:58 +02:00
afone-lboue
872293b203 Missing spooldir directories in RPM build script
Hello,

I am getting an error with rpmbuild because spooldir directories are missing. Can you fix this with this patch?

```
[admin@server cgr_build]$ rpmbuild -bb --define "_topdir $HOME/cgr_build" SPECS/cgrates.spec
Exécution_de(%prep) : /bin/sh -e /var/tmp/rpm-tmp.oxMhbk
+ umask 022
+ cd /home/admin/cgr_build/BUILD
+ cd /home/admin/cgr_build/BUILD
+ rm -rf cgrates-0.9.1rc7.87e12f6
+ /usr/bin/mkdir -p cgrates-0.9.1rc7.87e12f6
+ cd cgrates-0.9.1rc7.87e12f6
+ /usr/bin/gzip -dc /home/admin/cgr_build/SOURCES/87e12f6ea4cc7656baca4002baa6af48fca0c6d4.tar.gz
+ /usr/bin/tar -xf -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ mkdir -p src/github.com/cgrates
+ ln -sf ../../../cgrates-87e12f6ea4cc7656baca4002baa6af48fca0c6d4 src/github.com/cgrates/cgrates
+ exit 0
Exécution_de(%build) : /bin/sh -e /var/tmp/rpm-tmp.cT34vu
+ umask 022
+ cd /home/admin/cgr_build/BUILD
+ cd cgrates-0.9.1rc7.87e12f6
+ export GO15VENDOREXPERIMENT=1
+ GO15VENDOREXPERIMENT=1
+ export GOPATH=/home/admin/cgr_build/BUILD/cgrates-0.9.1rc7.87e12f6
+ GOPATH=/home/admin/cgr_build/BUILD/cgrates-0.9.1rc7.87e12f6
+ cd /home/admin/cgr_build/BUILD/cgrates-0.9.1rc7.87e12f6/src/github.com/cgrates/cgrates
+ go get -v github.com/Masterminds/glide
github.com/Masterminds/glide (download)
github.com/Masterminds/glide/vendor/github.com/Masterminds/vcs
github.com/Masterminds/glide/msg
github.com/Masterminds/glide/godep/strip
github.com/Masterminds/glide/path
github.com/Masterminds/glide/vendor/github.com/Masterminds/semver
github.com/Masterminds/glide/cache
github.com/Masterminds/glide/vendor/gopkg.in/yaml.v2
github.com/Masterminds/glide/mirrors
github.com/Masterminds/glide/util
github.com/Masterminds/glide/cfg
github.com/Masterminds/glide/dependency
github.com/Masterminds/glide/gb
github.com/Masterminds/glide/godep
github.com/Masterminds/glide/gom
github.com/Masterminds/glide/gpm
github.com/Masterminds/glide/importer
github.com/Masterminds/glide/vendor/github.com/codegangsta/cli
github.com/Masterminds/glide/repo
github.com/Masterminds/glide/tree
github.com/Masterminds/glide/action
github.com/Masterminds/glide
+ /home/admin/cgr_build/BUILD/cgrates-0.9.1rc7.87e12f6/bin/glide install
[WARN]  The name listed in the config file () does not match the current location (github.com/cgrates/cgrates)
[INFO]  Downloading dependencies. Please wait...
[INFO]  --> Found desired version locally github.com/cenk/hub 11382a9960d39b0ecda16fd01c424c11ff765a34!
[INFO]  --> Found desired version locally github.com/cenkalti/rpc2 7ab76d2e88c77ca1a715756036d8264b2886acd2!
[INFO]  --> Found desired version locally github.com/cgrates/fsock a8ffdbdfc8440016df008ba91e6f05f806d7a69f!
[INFO]  --> Found desired version locally github.com/cgrates/kamevapi a376b1f937ba959857929fa3e111c0f3243278c0!
[INFO]  --> Found desired version locally github.com/cgrates/osipsdagram 3d6beed663452471dec3ca194137a30d379d9e8f!
[INFO]  --> Found desired version locally github.com/cgrates/rpcclient 1d54b34b6a5531e1124728b489c44ec6a8ac231e!
[INFO]  --> Found desired version locally github.com/ChrisTrenkamp/goxpath 4aad8d0161aae7d17df4755d2c1e86cd1fcaaab6!
[INFO]  --> Found desired version locally github.com/DisposaBoy/JsonConfigReader 33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4!
[INFO]  --> Found desired version locally github.com/fiorix/go-diameter 9ada6bfd077a36dc892676633a2c9ca42d884202!
[INFO]  --> Found desired version locally github.com/go-sql-driver/mysql 3654d25ec346ee8ce71a68431025458d52a38ac0!
[INFO]  --> Found desired version locally github.com/gorhill/cronexpr f0984319b44273e83de132089ae42b1810f4933b!
[INFO]  --> Found desired version locally github.com/hashicorp/golang-lru 0a025b7e63adc15a622f29b0b2c4c3848243bbf6!
[INFO]  --> Found desired version locally github.com/jinzhu/gorm 3324ab20633e8c7ec6d6b1f7a714a1a6e06fec08!
[INFO]  --> Found desired version locally github.com/jinzhu/inflection 8f4d3a0d04ce0b7c0cf3126fb98524246d00d102!
[INFO]  --> Found desired version locally github.com/kr/pty a6bad5ee6fc60cad43d219214dd2449bf077f3f5!
[INFO]  --> Found desired version locally github.com/lib/pq 4dd446efc17690bc53e154025146f73203b18309!
[INFO]  --> Found desired version locally github.com/mediocregopher/radix.v2 ae04b3eb3731f94789205d1268e0759371166605!
[INFO]  --> Found desired version locally github.com/mitchellh/mapstructure d2dd0262208475919e1a362f675cfc0e7c10e905!
[INFO]  --> Found desired version locally github.com/peterh/liner 8975875355a81d612fafb9f5a6037bdcc2d9b073!
[INFO]  --> Found desired version locally github.com/ugorji/go b94837a2404ab90efe9289e77a70694c355739cb!
[INFO]  --> Found desired version locally golang.org/x/net b400c2eff1badec7022a8c8f5bea058b6315eed7!
[INFO]  --> Found desired version locally golang.org/x/sys a408501be4d17ee978c04a618e7a1b22af058c0e!
[INFO]  --> Found desired version locally golang.org/x/text ce78b075c2fbd48520f4995b173eb9fe18b56ef3!
[INFO]  --> Found desired version locally gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb!
[INFO]  --> Found desired version locally gopkg.in/mgo.v2 29cc868a5ca65f401ff318143f9408d02f4799cc!
[INFO]  Setting references.
[INFO]  --> Setting version for github.com/cenk/hub to 11382a9960d39b0ecda16fd01c424c11ff765a34.
[INFO]  --> Setting version for github.com/cenkalti/rpc2 to 7ab76d2e88c77ca1a715756036d8264b2886acd2.
[INFO]  --> Setting version for github.com/cgrates/fsock to a8ffdbdfc8440016df008ba91e6f05f806d7a69f.
[INFO]  --> Setting version for github.com/cgrates/kamevapi to a376b1f937ba959857929fa3e111c0f3243278c0.
[INFO]  --> Setting version for github.com/cgrates/osipsdagram to 3d6beed663452471dec3ca194137a30d379d9e8f.
[INFO]  --> Setting version for github.com/cgrates/rpcclient to 1d54b34b6a5531e1124728b489c44ec6a8ac231e.
[INFO]  --> Setting version for github.com/ChrisTrenkamp/goxpath to 4aad8d0161aae7d17df4755d2c1e86cd1fcaaab6.
[INFO]  --> Setting version for github.com/DisposaBoy/JsonConfigReader to 33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4.
[INFO]  --> Setting version for github.com/fiorix/go-diameter to 9ada6bfd077a36dc892676633a2c9ca42d884202.
[INFO]  --> Setting version for github.com/go-sql-driver/mysql to 3654d25ec346ee8ce71a68431025458d52a38ac0.
[INFO]  --> Setting version for github.com/gorhill/cronexpr to f0984319b44273e83de132089ae42b1810f4933b.
[INFO]  --> Setting version for github.com/hashicorp/golang-lru to 0a025b7e63adc15a622f29b0b2c4c3848243bbf6.
[INFO]  --> Setting version for github.com/jinzhu/gorm to 3324ab20633e8c7ec6d6b1f7a714a1a6e06fec08.
[INFO]  --> Setting version for github.com/jinzhu/inflection to 8f4d3a0d04ce0b7c0cf3126fb98524246d00d102.
[INFO]  --> Setting version for github.com/kr/pty to a6bad5ee6fc60cad43d219214dd2449bf077f3f5.
[INFO]  --> Setting version for github.com/lib/pq to 4dd446efc17690bc53e154025146f73203b18309.
[INFO]  --> Setting version for github.com/mediocregopher/radix.v2 to ae04b3eb3731f94789205d1268e0759371166605.
[INFO]  --> Setting version for github.com/mitchellh/mapstructure to d2dd0262208475919e1a362f675cfc0e7c10e905.
[INFO]  --> Setting version for github.com/peterh/liner to 8975875355a81d612fafb9f5a6037bdcc2d9b073.
[INFO]  --> Setting version for github.com/ugorji/go to b94837a2404ab90efe9289e77a70694c355739cb.
[INFO]  --> Setting version for golang.org/x/net to b400c2eff1badec7022a8c8f5bea058b6315eed7.
[INFO]  --> Setting version for golang.org/x/sys to a408501be4d17ee978c04a618e7a1b22af058c0e.
[INFO]  --> Setting version for golang.org/x/text to ce78b075c2fbd48520f4995b173eb9fe18b56ef3.
[INFO]  --> Setting version for gopkg.in/fsnotify.v1 to a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.
[INFO]  --> Setting version for gopkg.in/mgo.v2 to 29cc868a5ca65f401ff318143f9408d02f4799cc.
[INFO]  Exporting resolved dependencies...
[INFO]  --> Exporting github.com/cenk/hub
[INFO]  --> Exporting github.com/cenkalti/rpc2
[INFO]  --> Exporting github.com/cgrates/fsock
[INFO]  --> Exporting github.com/cgrates/kamevapi
[INFO]  --> Exporting github.com/cgrates/osipsdagram
[INFO]  --> Exporting github.com/cgrates/rpcclient
[INFO]  --> Exporting github.com/ChrisTrenkamp/goxpath
[INFO]  --> Exporting github.com/DisposaBoy/JsonConfigReader
[INFO]  --> Exporting github.com/fiorix/go-diameter
[INFO]  --> Exporting github.com/go-sql-driver/mysql
[INFO]  --> Exporting github.com/gorhill/cronexpr
[INFO]  --> Exporting github.com/jinzhu/gorm
[INFO]  --> Exporting github.com/jinzhu/inflection
[INFO]  --> Exporting github.com/kr/pty
[INFO]  --> Exporting github.com/lib/pq
[INFO]  --> Exporting github.com/mediocregopher/radix.v2
[INFO]  --> Exporting github.com/mitchellh/mapstructure
[INFO]  --> Exporting github.com/peterh/liner
[INFO]  --> Exporting github.com/ugorji/go
[INFO]  --> Exporting github.com/hashicorp/golang-lru
[INFO]  --> Exporting golang.org/x/net
[INFO]  --> Exporting golang.org/x/text
[INFO]  --> Exporting golang.org/x/sys
[INFO]  --> Exporting gopkg.in/fsnotify.v1
[INFO]  --> Exporting gopkg.in/mgo.v2
[INFO]  Replacing existing vendor dependencies
+ ./build.sh
Building CGRateS...
+ exit 0
Exécution_de(%install) : /bin/sh -e /var/tmp/rpm-tmp.qyBMTt
+ umask 022
+ cd /home/admin/cgr_build/BUILD
+ '[' /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64 '!=' / ']'
+ rm -rf /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64
++ dirname /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64
+ mkdir -p /home/admin/cgr_build/BUILDROOT
+ mkdir /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64
+ cd cgrates-0.9.1rc7.87e12f6
+ rm -rf /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/share/cgrates
+ cp -rpf src/github.com/cgrates/cgrates/data/conf src/github.com/cgrates/cgrates/data/daemontools src/github.com/cgrates/cgrates/data/diameter src/github.com/cgrates/cgrates/data/docker src/github.com/cgrates/cgrates/data/freeswitch src/github.com/cgrates/cgrates/data/kamailio src/github.com/cgrates/cgrates/data/monit src/github.com/cgrates/cgrates/data/scripts src/github.com/cgrates/cgrates/data/storage src/github.com/cgrates/cgrates/data/tariffplans src/github.com/cgrates/cgrates/data/tester src/github.com/cgrates/cgrates/data/tutorials src/github.com/cgrates/cgrates/data/vagrant /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/share/cgrates
+ install -D -m 0644 -p src/github.com/cgrates/cgrates/data/conf/cgrates/cgrates.json /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/etc/cgrates/cgrates.json
+ install -D -m 0755 -p bin/cgr-console /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/bin/cgr-console
+ install -D -m 0755 -p bin/cgr-engine /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/bin/cgr-engine
+ install -D -m 0755 -p bin/cgr-loader /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/bin/cgr-loader
+ install -D -m 0755 -p bin/cgr-tester /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/bin/cgr-tester
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/log/cgrates/cdrc/in
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/log/cgrates/cdrc/out
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/log/cgrates/cdre/csv
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/log/cgrates/cdre/fwv
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/lib/cgrates/history
+ mkdir -p /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/lib/cgrates/cache_dump
+ install -D -m 0644 -p src/github.com/cgrates/cgrates/packages/redhat_fedora/cgrates.options /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/etc/sysconfig/cgrates
+ install -D -m 0644 -p src/github.com/cgrates/cgrates/packages/redhat_fedora/cgrates.service /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/usr/lib/systemd/system/cgrates.service
+ /usr/lib/rpm/check-buildroot
+ /usr/lib/rpm/redhat/brp-compress
+ /usr/lib/rpm/redhat/brp-strip /usr/bin/strip
+ /usr/lib/rpm/redhat/brp-strip-comment-note /usr/bin/strip /usr/bin/objdump
+ /usr/lib/rpm/redhat/brp-strip-static-archive /usr/bin/strip
+ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1
+ /usr/lib/rpm/redhat/brp-python-hardlink
+ /usr/lib/rpm/redhat/brp-java-repack-jars
Traitement des fichiers : cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64
erreur : Fichier non trouvé par la substitution : /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/spool/cgrates/*

Erreur de construction de RPM :
    Fichier non trouvé par la substitution : /home/admin/cgr_build/BUILDROOT/cgrates-0.9.1rc7.87e12f6-1.el7.centos.x86_64/var/spool/cgrates/*
```
2016-08-24 12:33:20 +02:00
DanB
dda8fdd106 New configuration option: session_indexes for sm_generic 2016-08-24 08:41:53 +02:00
DanB
22e2befd5a Small test modification 2016-08-23 20:55:38 +02:00
DanB
48c52d357d Merge branch 'master' of https://github.com/cgrates/cgrates 2016-08-23 18:38:10 +02:00
DanB
0a73acf5af Fix FreeSWITCH test calls 2016-08-23 18:15:53 +02:00
Dan Christian Bogos
27de55ed42 Merge pull request #515 from eloycoto/cdrstat
[CdrStats] Fix issue with LASTExecutionID on update triggers
2016-08-23 17:40:59 +03:00
DanB
20222a75f8 Updating rpcclient tests 2016-08-23 15:40:55 +02:00
DanB
586a31d0a0 Remove TTL checks in LR 2016-08-23 10:31:28 +02:00
DanB
fbeb0cd197 Disable TTL check in response cache 2016-08-23 10:20:46 +02:00
Radu Ioan Fericean
869406187c removing MULTI command on redis driver
fixes #514
2016-08-22 12:44:58 +03:00
Radu Ioan Fericean
87e12f6ea4 use configs for cache lib 2016-08-19 14:06:37 +03:00
Radu Ioan Fericean
a78f6fc58f don't rebuild reverse mappings if no changes 2016-08-19 13:42:41 +03:00
DanB
d4e275e58c Merge branch 'master' of https://github.com/cgrates/cgrates 2016-08-19 11:04:21 +02:00
Radu Ioan Fericean
28299f4cf6 added cache lib to glide 2016-08-19 11:57:14 +03:00
DanB
e2eb93460a Merge branch 'master' of https://github.com/cgrates/cgrates 2016-08-18 21:15:49 +02:00
DanB
987d26c20b Fix for precaching RL rules 2016-08-18 21:15:41 +02:00
Radu Ioan Fericean
c939a49af3 using esternal library for cache 2016-08-18 20:17:51 +03:00
DanB
e5fab0e6d0 Delay in responder.Status for testing purposes 2016-08-18 19:06:07 +02:00
Radu Ioan Fericean
4afe6e69a3 simple lru again 2016-08-18 19:30:47 +03:00
Radu Ioan Fericean
348d0dd033 keep large values in map instad of list 2016-08-18 19:03:22 +03:00
Radu Ioan Fericean
b176c57bd8 back to lruttl implementation 2016-08-18 18:33:24 +03:00
Radu Ioan Fericean
3eeb5925b9 added more logging 2016-08-18 17:04:14 +03:00
Radu Ioan Fericean
dffd424bee experimental stripped down cache 2016-08-18 16:29:51 +03:00
Radu Ioan Fericean
5d26c5e31f compilation fix 2016-08-18 12:38:21 +03:00
Radu Ioan Fericean
8d286a7c07 disabled refunding logs 2016-08-18 12:35:41 +03:00
Radu Ioan Fericean
0c08467387 cgr-loader flag to disable reverse mappings 2016-08-18 11:58:11 +03:00
Eloy Coto
bdc30af37a [CdrStats] Fix issue with LASTExecutionID on update triggers 2016-08-17 17:16:26 +01:00
Radu Ioan Fericean
e142227780 possible fix for concurent map access in smg_event 2016-08-17 17:58:52 +03:00
Radu Ioan Fericean
3f777bf16f cache improvements 2016-08-17 14:16:11 +03:00
Radu Ioan Fericean
c189514763 removed extra log 2016-08-16 19:33:38 +03:00
Radu Ioan Fericean
1e053d2c8f fix get all eaction plans keys 2016-08-16 19:30:29 +03:00
Radu Ioan Fericean
58ad3a0cec fix ttl configuration 2016-08-16 18:54:48 +03:00
Radu Ioan Fericean
52ed43d54b more time to expire cache in test (for travis) 2016-08-16 18:51:14 +03:00
Radu Ioan Fericean
400ab8f772 Update .travis.yml
updated go version
2016-08-16 18:32:38 +03:00
Radu Ioan Fericean
4dd445eb9e small fix 2016-08-16 18:18:51 +03:00
Radu Ioan Fericean
ccf0f273a8 Merge branch 'master' into newcache 2016-08-16 18:12:30 +03:00
Radu Ioan Fericean
a7f3ae99c4 implemented get keys for prefix 2016-08-16 18:11:38 +03:00