From e089c0c1d9c36b5e39c99c28898ce28faba6cfcc Mon Sep 17 00:00:00 2001
From: gmallard <allard.guy.m@gmail.com>
Date: Tue, 26 Jul 2016 21:53:42 -0400
Subject: [PATCH] conndisc.go updated for common code / logging.

---
 conndisc/conndisc.go | 75 +++++++++++++---------------------------------------
 version.go           |  2 +-
 2 files changed, 20 insertions(+), 57 deletions(-)

diff --git a/conndisc/conndisc.go b/conndisc/conndisc.go
index 91685be..86584fd 100644
--- a/conndisc/conndisc.go
+++ b/conndisc/conndisc.go
@@ -45,12 +45,8 @@ package main
 
 import (
 	"log"
-	"net"
 	"os"
-	//
-	"github.com/gmallard/stompngo"
-	// senv methods could be used in general by stompngo clients.
-	"github.com/gmallard/stompngo/senv"
+	"time"
 	// sngecomm methods are used specifically for these example clients.
 	"github.com/gmallard/stompngo_examples/sngecomm"
 )
@@ -58,69 +54,36 @@ import (
 var (
 	exampid = "conndisc: "
 	ll      = log.New(os.Stdout, "ECNDS ", log.Ldate|log.Lmicroseconds|log.Lshortfile)
+	tag     = "condiscmain"
 )
 
 // Connect to a STOMP broker and disconnect.
 func main() {
-	ll.Printf("%s v1:%v\n", exampid, "starts_...")
 
-	// Open a net connection
-	h, p := senv.HostAndPort()
-	hap := net.JoinHostPort(h, p)
-	ll.Printf("%s v1:%v v2:%v\n", exampid, "will dial ...", hap)
-	n, e := net.Dial("tcp", hap)
-	if e != nil {
-		ll.Fatalf("%s v1:%v v2:%v\n", exampid, "netdial", e) // Handle this ......
-	}
-	ll.Printf("%s v1:%v v2:%v\n", exampid, "dial complete ...", hap)
-
-	// All stomp API methods require 'Headers'.  Stomp headers are key/value
-	// pairs.  The stompngo package implements them using a string slice.
-	ch := sngecomm.ConnectHeaders()
+	st := time.Now()
 
-	// Get a stomp connection.  Parameters are:
-	// a) the opened net connection
-	// b) the Connect Headers
-	conn, e := stompngo.Connect(n, ch)
+	// Standard example connect sequence
+	n, conn, e := sngecomm.CommonConnect(exampid, tag, ll)
 	if e != nil {
-		ll.Fatalf("%s v1:%v v2:%v\n", exampid, "sngConnect", e) // Handle this ......
+		ll.Fatalf("%stag:%s connsess:%s main_on_connect error:%v",
+			exampid, tag, sngecomm.Lcs,
+			e.Error()) // Handle this ......
 	}
-	ll.Printf("%s v1:%v v2:%v v3:%v\n", exampid, "stomp connect complete, protocol level is:", conn.Protocol())
 
-	// Show connect response
-	ll.Printf("%s v1:%v v2:%v\n", exampid, "connect response:", conn.ConnectResponse)
-
-	if senv.Heartbeats() != "" {
-		ll.Printf("%s v1:%v v2:%v\n", exampid, "heart-beat send:", conn.SendTickerInterval())
-		ll.Printf("%s v1:%v v2:%v\n", exampid, "heart-beat receive:", conn.ReceiveTickerInterval())
-	}
+	// *NOTE* application specific functionaltiy starts here!
+	// For you to add.
+	// *NOTE* application specific functionaltiy ends here!
 
-	// *NOTE* your application functionaltiy goes here!
-
-	// Stomp disconnects are not required, but highly recommended.
-	// We use empty headers here for the DISCONNECT.  This will trigger the
-	// disconnect receipt described below.
-	//
-	// If you do *not* want a disconnect receipt use:
-	// stompngo.Headers{"noreceipt", "true"}
-	//
-	e = conn.Disconnect(stompngo.Headers{})
+	// Standard example disconnect sequence
+	e = sngecomm.CommonDisconnect(n, conn, exampid, tag, ll)
 	if e != nil {
-		ll.Fatalf("%s v1:%v v2:%v\n", exampid, "sngDisconnect", e) // Handle this ......
+		ll.Fatalf("%stag:%s connsess:%s main_on_disconnect error:%v",
+			exampid, tag, conn.Session(),
+			e.Error()) // Handle this ......
 	}
-	ll.Printf("%s v1:%v\n", exampid, "stomp_disconnect_complete_...")
-
-	// After a DISCONNECT there is (by default) a 'Disconnect
-	// Receipt' available.  The disconnect receipt is an instance of
-	// stompngo.MessageData.
-	ll.Printf("%s v1:%v v2:%v\n", exampid, "disconnect receipt", conn.DisconnectReceipt)
 
-	// Close the net connection.
-	e = n.Close()
-	if e != nil {
-		ll.Fatalf("%s %s\n", exampid, e.Error()) // Handle this ......
-	}
-	ll.Printf("%s v1:%v\n", exampid, "network_close_complete_...")
+	ll.Printf("%stag:%s connsess:%s main_elapsed:%v\n",
+		exampid, tag, conn.Session(),
+		time.Now().Sub(st))
 
-	ll.Printf("%s v1:%v\n", exampid, "ends_...")
 }
diff --git a/version.go b/version.go
index 93f505f..0b87f4e 100644
--- a/version.go
+++ b/version.go
@@ -35,7 +35,7 @@ var (
 
 	//patch = "3" // Patch
 
-	patch = "3.plvl.003" // Patch
+	patch = "3.plvl.004" // Patch
 )
 
 func Version() string {
-- 
2.11.4.GIT