From 7f4dd1600acfd7d61d06acb5f02b8b592a0a265d Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Fri, 3 May 2019 15:46:50 +0300
Subject: [PATCH] Correctly scripts from tutorial/osips/ to have the right path

---
 data/tutorials/osips/cgrates/etc/cgrates/cgrates.json   | 7 +++++--
 data/tutorials/osips/cgrates/etc/init.d/cgrates         | 2 +-
 data/tutorials/osips/opensips/etc/init.d/opensips       | 2 +-
 data/tutorials/osips/opensips/etc/opensips/opensips.cfg | 6 +++++-
 sessions/sessions.go                                    | 5 +++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json b/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json
index 91466be52..15188fa12 100644
--- a/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json
@@ -41,6 +41,9 @@
 	"stats_conns": [
 		{"address": "*internal"}
 	],
+	"chargers_conns": [
+    	{"address": "*internal"}
+    ],
 	"sessions_cost_retries": 5,
 },
 
@@ -57,8 +60,8 @@
 	"enabled": true,
 	"listen_bijson": "127.0.0.1:2014",		// address where to listen for bidirectional JSON-RPC requests
 	"chargers_conns": [
-                {"address": "*internal"}
-        ],
+    	{"address": "*internal"}
+    ],
 	"rals_conns": [
 		{"address": "*internal"}
 	],
diff --git a/data/tutorials/osips/cgrates/etc/init.d/cgrates b/data/tutorials/osips/cgrates/etc/init.d/cgrates
index f38563305..cd228da46 100755
--- a/data/tutorials/osips/cgrates/etc/init.d/cgrates
+++ b/data/tutorials/osips/cgrates/etc/init.d/cgrates
@@ -21,7 +21,7 @@ DAEMON=/usr/bin/cgr-engine
 USER=cgrates
 GROUP=cgrates
 DAEMON_OPTS=""
-TUTFOLDER=/usr/share/cgrates/tutorials/osips_native/$NAME
+TUTFOLDER=/usr/share/cgrates/tutorials/osips/$NAME
 TMP_DIR=/tmp/cgr_osipsnative/$NAME
 SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME
 RUNDIR=$TMP_DIR/run
diff --git a/data/tutorials/osips/opensips/etc/init.d/opensips b/data/tutorials/osips/opensips/etc/init.d/opensips
index efc1031a3..30097e0e1 100755
--- a/data/tutorials/osips/opensips/etc/init.d/opensips
+++ b/data/tutorials/osips/opensips/etc/init.d/opensips
@@ -19,7 +19,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/opensips
 NAME=opensips
 DESC=opensips
-TUTDIR=/usr/share/cgrates/tutorials/osips_native/$NAME
+TUTDIR=/usr/share/cgrates/tutorials/osips/$NAME
 SCRIPTNAME=$TUTDIR/etc/init.d/$NAME
 TMP_DIR=/tmp/cgr_osipsnative/$NAME
 CFGFILE=$TUTDIR/etc/$NAME/opensips.cfg
diff --git a/data/tutorials/osips/opensips/etc/opensips/opensips.cfg b/data/tutorials/osips/opensips/etc/opensips/opensips.cfg
index 6d4d94f1c..678466d38 100644
--- a/data/tutorials/osips/opensips/etc/opensips/opensips.cfg
+++ b/data/tutorials/osips/opensips/etc/opensips/opensips.cfg
@@ -23,7 +23,11 @@ udp_workers=4
 
 auto_aliases=no
 
-listen=udp:enp0s8:5060
+listen=udp:enp0s3:5060
+listen=udp:127.0.0.1:5080
+listen=udp:127.0.0.1:5060
+listen=udp:enp0s3:5080
+
 
 
 ####### Modules Section ########
diff --git a/sessions/sessions.go b/sessions/sessions.go
index 336b1ca2c..7cd57603d 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -378,6 +378,7 @@ func (sS *SessionS) forceSTerminate(s *Session, extraDebit time.Duration, lastUs
 	}
 	cgrEv := utils.CGREvent{
 		Tenant: s.Tenant,
+		ID:     utils.GenUUID(),
 		Event:  s.EventStart.AsMapInterface(),
 	}
 	// post the CDRs
@@ -385,8 +386,8 @@ func (sS *SessionS) forceSTerminate(s *Session, extraDebit time.Duration, lastUs
 		if cgrEvs, err := s.asCGREvents(); err != nil {
 			utils.Logger.Warning(
 				fmt.Sprintf(
-					"<%s> could not post CDR for event %s, err: %s",
-					utils.SessionS, utils.ToJSON(cgrEv), err.Error()))
+					"<%s> failed convering session: %s in CGREvents with err: %s",
+					utils.SessionS, utils.ToJSON(s), err.Error()))
 		} else {
 			var reply string
 			for _, cgrEv := range cgrEvs {