fangdingjun
/
obfssh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

log library updated

Browse Source
tls
dingjun 6 years ago
parent 99e82f9943
commit bfe65cf0e6
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
obfscp/scp.go
Unescape Escape View File

@ -16,8 +16,6 @@ import (
"github.com/bgentry/speakeasy" "github.com/bgentry/speakeasy"
"github.com/fangdingjun/go-log" "github.com/fangdingjun/go-log"
"github.com/fangdingjun/go-log/formatters"
"github.com/fangdingjun/go-log/writers"
"github.com/fangdingjun/obfssh" "github.com/fangdingjun/obfssh"
"github.com/kr/fs" "github.com/kr/fs"
"github.com/pkg/sftp" "github.com/pkg/sftp"
@ -68,7 +66,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if logfile != "" { if logfile != "" {
log.Default.Out = &writers.FixedSizeFileWriter{ log.Default.Out = &log.FixedSizeFileWriter{
MaxCount: logFileCount, MaxCount: logFileCount,
Name: logfile, Name: logfile,
MaxSize: logFileSize * 1024 * 1024, MaxSize: logFileSize * 1024 * 1024,
@ -84,8 +82,6 @@ func main() {
log.Default.Level = lv log.Default.Level = lv
} }
log.Default.Formatter = &formatters.TextFormatter{TimeFormat: "2006-01-02 15:04:05.000"}
var err error var err error
if strings.Contains(args[0], ":") { if strings.Contains(args[0], ":") {

6
obfssh/ssh.go
Unescape Escape View File

@ -13,8 +13,6 @@ import (
"github.com/bgentry/speakeasy" "github.com/bgentry/speakeasy"
"github.com/fangdingjun/go-log" "github.com/fangdingjun/go-log"
"github.com/fangdingjun/go-log/formatters"
"github.com/fangdingjun/go-log/writers"
"github.com/fangdingjun/obfssh" "github.com/fangdingjun/obfssh"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
@ -55,7 +53,7 @@ func main() {
flag.Parse() flag.Parse()
if logfile != "" { if logfile != "" {
log.Default.Out = &writers.FixedSizeFileWriter{ log.Default.Out = &log.FixedSizeFileWriter{
MaxCount: logFileCount, MaxCount: logFileCount,
Name: logfile, Name: logfile,
MaxSize: logFileSize * 1024 * 1024, MaxSize: logFileSize * 1024 * 1024,
@ -75,8 +73,6 @@ func main() {
log.Default.Level = lv log.Default.Level = lv
} }
log.Default.Formatter = &formatters.TextFormatter{TimeFormat: "2006-01-02 15:04:05.000"}
if configfile != "" { if configfile != "" {
if err := loadConfig(&cfg, configfile); err != nil { if err := loadConfig(&cfg, configfile); err != nil {
log.Fatal(err) log.Fatal(err)

6
obfsshd/server.go
Unescape Escape View File

@ -11,8 +11,6 @@ import (
"os" "os"
"github.com/fangdingjun/go-log" "github.com/fangdingjun/go-log"
"github.com/fangdingjun/go-log/formatters"
"github.com/fangdingjun/go-log/writers"
"github.com/fangdingjun/obfssh" "github.com/fangdingjun/obfssh"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@ -34,7 +32,7 @@ func main() {
flag.Parse() flag.Parse()
if logfile != "" { if logfile != "" {
log.Default.Out = &writers.FixedSizeFileWriter{ log.Default.Out = &log.FixedSizeFileWriter{
MaxCount: logFileCount, MaxCount: logFileCount,
Name: logfile, Name: logfile,
MaxSize: logFileSize * 1024 * 1024, MaxSize: logFileSize * 1024 * 1024,
@ -50,8 +48,6 @@ func main() {
log.Default.Level = lv log.Default.Level = lv
} }
log.Default.Formatter = &formatters.TextFormatter{TimeFormat: "2006-01-02 15:04:05.000"}
conf, err := loadConfig(configfile) conf, err := loadConfig(configfile)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)

Write Preview
Loading…
Cancel
Save