Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mod: use fresh log15 #3

Merged
merged 3 commits into from
Nov 29, 2018
Merged

mod: use fresh log15 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0c1444
mod: use forked log15
Nov 29, 2018
ff0a906
mod: stop using the fork
Nov 29, 2018
9fd0af3
fixup! mod: use forked log15
Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/client-conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"io"
"net"
"unicode"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

// A ServerMessage implements a message sent from the server to the client.
Expand Down
2 changes: 1 addition & 1 deletion client/pixel-format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

func readPixelFormat(r io.Reader, result *common.PixelFormat) error {
Expand Down
6 changes: 3 additions & 3 deletions client/server-messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"io"
"strings"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
)

// MsgFramebufferUpdate consists of a sequence of rectangles of
Expand Down
4 changes: 2 additions & 2 deletions client/write-to.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package client

import (
"io"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

type WriteTo struct {
Expand Down
2 changes: 1 addition & 1 deletion common/rfb-reader-helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/binary"
"errors"
"io"
"github.com/exoscale/vncproxy/logger"
"vncproxy/logger"
)

var TightMinToCompress = 12
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-copy-rect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package encodings
import (
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type CopyRectEncoding struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-corre.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package encodings
import (
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type CoRREEncoding struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-cursor-pseudo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package encodings
import (
"io"
"math"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type EncCursorPseudo struct {
Expand Down
4 changes: 2 additions & 2 deletions encodings/enc-hextile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package encodings

import (
"io"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions encodings/enc-led-state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package encodings

import (
"io"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

type EncLedStatePseudo struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-pseudo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package encodings

import (
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type PseudoEncoding struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-raw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package encodings
import (
"bytes"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

// RawEncoding is raw pixel data sent by the server.
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-rre.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package encodings
import (
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type RREEncoding struct {
Expand Down
4 changes: 2 additions & 2 deletions encodings/enc-tight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"errors"
"io"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

var TightMinToCompress int = 12
Expand Down
4 changes: 2 additions & 2 deletions encodings/enc-tightpng.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package encodings
import (
"fmt"
"io"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

type TightPngEncoding struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-zlib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type ZLibEncoding struct {
Expand Down
2 changes: 1 addition & 1 deletion encodings/enc-zrle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type ZRLEEncoding struct {
Expand Down
8 changes: 5 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
module github.com/exoscale/vncproxy
module vncproxy

require (
github.com/go-stack/stack v1.8.0 // indirect
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e
golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec
)
14 changes: 10 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
github.com/exoscale/log15 v2.11.0+incompatible h1:234j5Eyq6V6TVE25cgp6SS2lWB4Vp6/lYklQ4XaQhYc=
github.com/exoscale/log15 v2.11.0+incompatible/go.mod h1:VWUakuVl/g/fjJW0vIf9rP2hvD5C+fdIEznZz1QoeEs=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e h1:L91+qpxBn9WAZLaC9mfKZ1bOZaWfxM/6LtH9nL6FJ/Q=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76 h1:xx5MUFyRQRbPk6VjWjIE1epE/K5AoDD8QUN116NCy8k=
golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU=
golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
10 changes: 5 additions & 5 deletions player/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"flag"
"fmt"
"os"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/player"
"github.com/exoscale/vncproxy/server"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
"vncproxy/player"
"vncproxy/server"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions player/fbs-play-listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"io"
"time"
"github.com/exoscale/vncproxy/client"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/server"
"vncproxy/client"
"vncproxy/common"
"vncproxy/logger"
"vncproxy/server"
)

type VncStreamFileReader interface {
Expand Down
6 changes: 3 additions & 3 deletions player/fbs-reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/binary"
"io"
"os"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
)

type FbsReader struct {
Expand Down
8 changes: 4 additions & 4 deletions player/player_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package player
import (
"testing"
"time"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/server"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
"vncproxy/server"
)

func TestServer(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions proxy/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"flag"
"os"

"github.com/exoscale/vncproxy/logger"
vncproxy "github.com/exoscale/vncproxy/proxy"
"vncproxy/logger"
vncproxy "vncproxy/proxy"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions proxy/message-listeners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package proxy

import (
"github.com/exoscale/vncproxy/client"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/server"
"vncproxy/client"
"vncproxy/common"
"vncproxy/logger"
"vncproxy/server"
)

type ClientUpdater struct {
Expand Down
14 changes: 7 additions & 7 deletions proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"path"
"strconv"
"time"
"github.com/exoscale/vncproxy/client"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/player"
listeners "github.com/exoscale/vncproxy/recorder"
"github.com/exoscale/vncproxy/server"
"vncproxy/client"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
"vncproxy/player"
listeners "vncproxy/recorder"
"vncproxy/server"
)

type VncProxy struct {
Expand Down
10 changes: 5 additions & 5 deletions recorder/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"net"
"os"
"time"
"github.com/exoscale/vncproxy/client"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/encodings"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/recorder"
"vncproxy/client"
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
"vncproxy/recorder"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions recorder/recorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/binary"
"os"
"time"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"github.com/exoscale/vncproxy/server"
"vncproxy/common"
"vncproxy/logger"
"vncproxy/server"
)

type Recorder struct {
Expand Down
6 changes: 3 additions & 3 deletions recorder/rfb-requester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package recorder

import (
"time"
"github.com/exoscale/vncproxy/client"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/client"
"vncproxy/common"
"vncproxy/logger"
)

type RfbRequester struct {
Expand Down
2 changes: 1 addition & 1 deletion server/client-messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package server
import (
"encoding/binary"
"io"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

// Key represents a VNC key press.
Expand Down
4 changes: 2 additions & 2 deletions server/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package server
import (
"encoding/binary"
"fmt"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"

"io"
"github.com/exoscale/vncproxy/logger"
"vncproxy/logger"
)

const ProtoVersionLength = 12
Expand Down
2 changes: 1 addition & 1 deletion server/security.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"crypto/rand"
"errors"
"log"
"github.com/exoscale/vncproxy/common"
"vncproxy/common"
)

type SecurityType uint8
Expand Down
4 changes: 2 additions & 2 deletions server/server-conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"io"
"sync"
"github.com/exoscale/vncproxy/common"
"github.com/exoscale/vncproxy/logger"
"vncproxy/common"
"vncproxy/logger"
)

type ServerConn struct {
Expand Down
Loading