From f8a3c9a14edca6df0647d89cf225f2470cbe025c Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 23 Nov 2015 15:51:43 -0800
Subject: upgrading libs

---
 api/server.go  | 10 ++++------
 model/user.go  |  2 +-
 model/utils.go |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/api/server.go b/api/server.go
index 347f0e2c9..2bab62fac 100644
--- a/api/server.go
+++ b/api/server.go
@@ -9,15 +9,14 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
-	"github.com/throttled/throttled"
-	throttledStore "github.com/throttled/throttled/store"
+	"gopkg.in/throttled/throttled.v1"
+	throttledStore "gopkg.in/throttled/throttled.v1/store"
 	"net/http"
 	"strings"
 	"time"
 )
 
 type Server struct {
-	Server *manners.GracefulServer
 	Store  store.Store
 	Router *mux.Router
 }
@@ -29,7 +28,6 @@ func NewServer() {
 	l4g.Info("Server is initializing...")
 
 	Srv = &Server{}
-	Srv.Server = manners.NewServer()
 	Srv.Store = store.NewSqlStore()
 
 	Srv.Router = mux.NewRouter()
@@ -71,7 +69,7 @@ func StartServer() {
 	}
 
 	go func() {
-		err := Srv.Server.ListenAndServe(utils.Cfg.ServiceSettings.ListenAddress, handler)
+		err := manners.ListenAndServe(utils.Cfg.ServiceSettings.ListenAddress, handler)
 		if err != nil {
 			l4g.Critical("Error starting server, err:%v", err)
 			time.Sleep(time.Second)
@@ -84,7 +82,7 @@ func StopServer() {
 
 	l4g.Info("Stopping Server...")
 
-	Srv.Server.Shutdown <- true
+	manners.Close()
 	Srv.Store.Close()
 	hub.Stop()
 
diff --git a/model/user.go b/model/user.go
index 77dc04a03..4ba35c6c4 100644
--- a/model/user.go
+++ b/model/user.go
@@ -4,9 +4,9 @@
 package model
 
 import (
-	"code.google.com/p/go.crypto/bcrypt"
 	"encoding/json"
 	"fmt"
+	"golang.org/x/crypto/bcrypt"
 	"io"
 	"regexp"
 	"strings"
diff --git a/model/utils.go b/model/utils.go
index ff26bfc66..b49b4bb24 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -5,10 +5,10 @@ package model
 
 import (
 	"bytes"
-	"code.google.com/p/go-uuid/uuid"
 	"encoding/base32"
 	"encoding/json"
 	"fmt"
+	"github.com/pborman/uuid"
 	"io"
 	"net/mail"
 	"net/url"
-- 
cgit v1.2.3-1-g7c22