Skip to content
Snippets Groups Projects
Commit 63ef6633 authored by Richer Maximilien's avatar Richer Maximilien
Browse files

Tweak doc

* Tweak comments
* go-vet cleaning
* Update CI deps config
* Fix unused lib
* Metalinter fixs
parent 8417c9ff
No related branches found
No related tags found
1 merge request!8113 grpc lib
Pipeline #
This commit is part of merge request !8. Comments created here will be created in the context of that merge request.
...@@ -15,7 +15,7 @@ Unit tests: ...@@ -15,7 +15,7 @@ Unit tests:
- "coverage.html" - "coverage.html"
script: script:
- "ln -s $(pwd) $GOPATH/src/dfss" - "ln -s $(pwd) $GOPATH/src/dfss"
- "go get gopkg.in/mgo.v2" - "./build/deps.sh"
- "go test -coverprofile auth.part -v ./auth" - "go test -coverprofile auth.part -v ./auth"
- "go test -coverprofile mgdb.part -v ./mgdb" - "go test -coverprofile mgdb.part -v ./mgdb"
- "go test -coverprofile mails.part -v ./mails" - "go test -coverprofile mails.part -v ./mails"
...@@ -28,7 +28,7 @@ ARM tests: ...@@ -28,7 +28,7 @@ ARM tests:
tags: tags:
- arm - arm
script: script:
- "go get gopkg.in/mgo.v2" - "./build/deps.sh"
- "go test -cover -short -v ./auth" - "go test -cover -short -v ./auth"
- "go test -cover -short -v ./mgdb" - "go test -cover -short -v ./mgdb"
...@@ -41,7 +41,7 @@ Code lint: ...@@ -41,7 +41,7 @@ Code lint:
script: script:
- "ln -s $(pwd) $GOPATH/src/dfss" - "ln -s $(pwd) $GOPATH/src/dfss"
- "go get github.com/alecthomas/gometalinter" - "go get github.com/alecthomas/gometalinter"
- "go get gopkg.in/mgo.v2" - "./build/deps.sh"
- "go install ./..." - "go install ./..."
- "gometalinter --install" - "gometalinter --install"
- "gometalinter -t --deadline=100s -j1 ./..." - "gometalinter -t --deadline=100s -j1 ./..."
build/deps.sh 0 → 100755
#!/bin/sh
# mongo
go get gopkg.in/mgo.v2
# grpc
go get google.golang.org/grpc
...@@ -3,25 +3,22 @@ package net ...@@ -3,25 +3,22 @@ package net
import ( import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"flag"
"io/ioutil"
"log" "log"
"math/rand"
"golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
) )
// Connect to a peer // Connect to a peer.
// //
// Given parameters cert/key/ca are PEM-encoded array of byte
// Closing must be defered after call // Closing must be defered after call
func Connect(addr_port string, cert, key, ca []byte) *ClientConn { func Connect(addrPort string, cert, key, ca []byte) *grpc.ClientConn {
// load peer cert/key, ca as PEM buffers // load peer cert/key, ca as PEM buffers
peerCert, err := tls.X509KeyPair(cert, key) peerCert, err := tls.X509KeyPair(cert, key)
if err != nil { if err != nil {
log.Fatal("Load peer cert/key error: %v", err) log.Fatalf("Load peer cert/key error: %v", err)
} }
caCertPool := x509.NewCertPool() caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(ca) caCertPool.AppendCertsFromPEM(ca)
...@@ -33,7 +30,7 @@ func Connect(addr_port string, cert, key, ca []byte) *ClientConn { ...@@ -33,7 +30,7 @@ func Connect(addr_port string, cert, key, ca []byte) *ClientConn {
}) })
// let's do the dialing ! // let's do the dialing !
con, err := grpc.Dial(addr_port, grpc.WithTransportCredentials(ta)) con, err := grpc.Dial(addrPort, grpc.WithTransportCredentials(ta))
if err != nil { if err != nil {
grpclog.Fatalf("Fail to dial: %v", err) grpclog.Fatalf("Fail to dial: %v", err)
} }
......
...@@ -3,31 +3,27 @@ package net ...@@ -3,31 +3,27 @@ package net
import ( import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"flag"
"fmt"
"io/ioutil"
"log" "log"
"net" "net"
"golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
) )
// Create a new grpc server with given tls creds // NewServer create a new grpc server with given tls credentials.
// //
// cert/key/ca are PEM-encoded array of byte // cert/key/ca are PEM-encoded array of byte
// //
// The returned grpcServer must be used in association with server{} to // The returned grpcServer must be used in association with server{} to
// register APIs before calling Listen() // register APIs before calling Listen()
func NewServer(cert, key, ca []byte) *Server { func NewServer(cert, key, ca []byte) *grpc.Server {
// configure gRPC // configure gRPC
var opts []grpc.ServerOption var opts []grpc.ServerOption
serverCert, err := tls.X509KeyPair(cert, key) serverCert, err := tls.X509KeyPair(cert, key)
if err != nil { if err != nil {
log.Fatal("Load peer cert/key error: %v", err) log.Fatalf("Load peer cert/key error: %v", err)
} }
caCertPool := x509.NewCertPool() caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(ca) caCertPool.AppendCertsFromPEM(ca)
...@@ -44,16 +40,20 @@ func NewServer(cert, key, ca []byte) *Server { ...@@ -44,16 +40,20 @@ func NewServer(cert, key, ca []byte) *Server {
return grpc.NewServer(opts...) return grpc.NewServer(opts...)
} }
// Listen with specified server on addr:port TCP // Listen with specified server on addr:port.
// //
// addr is the addr to bind to // addrPort is formated as 127.0.0.1:8001
// port is the port to listen on // * addr is the addr to bind to,
func Listen(addr, port string, grpcServer *Server) { // * port is the port to listen on
func Listen(addrPort string, grpcServer *grpc.Server) {
// open tcp socket // open tcp socket
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port)) lis, err := net.Listen("tcp", addrPort)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to open tcp socket: %v", err) grpclog.Fatalf("Failed to open tcp socket: %v", err)
} }
grpcServer.Serve(lis) err = grpcServer.Serve(lis)
if err != nil {
grpclog.Fatalf("Failed to bind gRPC server: %v", err)
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment