Commit b1251b93 authored by =Corey Hulen's avatar =Corey Hulen

Upgrade logging package

parent 01d6a484
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"os" "os"
"strings" "strings"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
......
...@@ -5,7 +5,7 @@ package api ...@@ -5,7 +5,7 @@ package api
import ( import (
"bytes" "bytes"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
"html/template" "html/template"
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"net/http" "net/http"
......
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"strings" "strings"
"time" "time"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"strings" "strings"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/store" "github.com/mattermost/platform/store"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -5,8 +5,8 @@ package api ...@@ -5,8 +5,8 @@ package api
import ( import (
"bytes" "bytes"
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
"github.com/goamz/goamz/aws" "github.com/goamz/goamz/aws"
"github.com/goamz/goamz/s3" "github.com/goamz/goamz/s3"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/store" "github.com/mattermost/platform/store"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"net/http" "net/http"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/braintree/manners" "github.com/braintree/manners"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/store" "github.com/mattermost/platform/store"
......
...@@ -6,8 +6,8 @@ package api ...@@ -6,8 +6,8 @@ package api
import ( import (
"archive/zip" "archive/zip"
"bytes" "bytes"
l4g "code.google.com/p/log4go"
"encoding/json" "encoding/json"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"io" "io"
"mime/multipart" "mime/multipart"
......
...@@ -5,8 +5,8 @@ package api ...@@ -5,8 +5,8 @@ package api
import ( import (
"bytes" "bytes"
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/store" "github.com/mattermost/platform/store"
......
...@@ -5,9 +5,9 @@ package api ...@@ -5,9 +5,9 @@ package api
import ( import (
"bytes" "bytes"
l4g "code.google.com/p/log4go"
b64 "encoding/base64" b64 "encoding/base64"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
"github.com/golang/freetype" "github.com/golang/freetype"
"github.com/gorilla/mux" "github.com/gorilla/mux"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/store" "github.com/mattermost/platform/store"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package api package api
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
"EnableTesting": false, "EnableTesting": false,
"EnableDeveloper": false, "EnableDeveloper": false,
"EnableSecurityFixAlert": true, "EnableSecurityFixAlert": true,
"SessionLengthWebInDays" : 30, "SessionLengthWebInDays": 30,
"SessionLengthMobileInDays" : 30, "SessionLengthMobileInDays": 30,
"SessionLengthSSOInDays" : 30, "SessionLengthSSOInDays": 30,
"SessionCacheInMinutes" : 10 "SessionCacheInMinutes": 10
}, },
"TeamSettings": { "TeamSettings": {
"SiteName": "Mattermost", "SiteName": "Mattermost",
...@@ -107,5 +107,28 @@ ...@@ -107,5 +107,28 @@
"AuthEndpoint": "", "AuthEndpoint": "",
"TokenEndpoint": "", "TokenEndpoint": "",
"UserApiEndpoint": "" "UserApiEndpoint": ""
},
"GoogleSettings": {
"Enable": false,
"Secret": "",
"Id": "",
"Scope": "",
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
},
"LdapSettings": {
"Enable": false,
"LdapServer": null,
"LdapPort": 389,
"BaseDN": null,
"BindUsername": null,
"BindPassword": null,
"FirstNameAttribute": null,
"LastNameAttribute": null,
"EmailAttribute": null,
"UsernameAttribute": null,
"IdAttribute": null,
"QueryTimeout": 60
} }
} }
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package manualtesting package manualtesting
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/api" "github.com/mattermost/platform/api"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package manualtesting package manualtesting
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
......
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
"syscall" "syscall"
"time" "time"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/api" "github.com/mattermost/platform/api"
"github.com/mattermost/platform/manualtesting" "github.com/mattermost/platform/manualtesting"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
......
...@@ -5,8 +5,8 @@ package model ...@@ -5,8 +5,8 @@ package model
import ( import (
"bytes" "bytes"
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package store package store
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/go-gorp/gorp" "github.com/go-gorp/gorp"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils" "github.com/mattermost/platform/utils"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package store package store
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
package store package store
import ( import (
l4g "code.google.com/p/log4go"
"crypto/aes" "crypto/aes"
"crypto/cipher" "crypto/cipher"
"crypto/hmac" "crypto/hmac"
...@@ -16,6 +15,7 @@ import ( ...@@ -16,6 +15,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"io" "io"
sqltrace "log" sqltrace "log"
"math/rand" "math/rand"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package store package store
import ( import (
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"time" "time"
) )
......
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
l4g "code.google.com/p/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
...@@ -77,7 +77,9 @@ func configureLog(s *model.LogSettings) { ...@@ -77,7 +77,9 @@ func configureLog(s *model.LogSettings) {
level = l4g.ERROR level = l4g.ERROR
} }
l4g.AddFilter("stdout", level, l4g.NewConsoleLogWriter()) lw := l4g.NewConsoleLogWriter()
lw.SetFormat("[%D %T] [%L] %M")
l4g.AddFilter("stdout", level, lw)
} }
if s.EnableFile { if s.EnableFile {
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
package utils package utils
import ( import (
l4g "code.google.com/p/log4go"
"crypto/tls" "crypto/tls"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
"net" "net"
"net/mail" "net/mail"
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
package web package web
import ( import (
l4g "code.google.com/p/log4go"
"fmt" "fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/mattermost/platform/api" "github.com/mattermost/platform/api"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment