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

Upgrade logging package

parent 01d6a484
......@@ -9,7 +9,7 @@ import (
"os"
"strings"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
......
......@@ -5,7 +5,7 @@ package api
import (
"bytes"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
"html/template"
......
......@@ -4,8 +4,8 @@
package api
import (
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"net/http"
......
......@@ -11,7 +11,7 @@ import (
"strings"
"time"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
......
......@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/store"
"github.com/mattermost/platform/utils"
......
......@@ -5,8 +5,8 @@ package api
import (
"bytes"
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/disintegration/imaging"
"github.com/goamz/goamz/aws"
"github.com/goamz/goamz/s3"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......
......@@ -4,8 +4,8 @@
package api
import (
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
......
......@@ -4,8 +4,8 @@
package api
import (
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/store"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"net/http"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/braintree/manners"
"github.com/gorilla/mux"
"github.com/mattermost/platform/store"
......
......@@ -6,8 +6,8 @@ package api
import (
"archive/zip"
"bytes"
l4g "code.google.com/p/log4go"
"encoding/json"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"io"
"mime/multipart"
......
......@@ -5,8 +5,8 @@ package api
import (
"bytes"
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/store"
......
......@@ -5,9 +5,9 @@ package api
import (
"bytes"
l4g "code.google.com/p/log4go"
b64 "encoding/base64"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/disintegration/imaging"
"github.com/golang/freetype"
"github.com/gorilla/mux"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/websocket"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/store"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
"github.com/mattermost/platform/model"
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......
......@@ -4,7 +4,7 @@
package api
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
......
......@@ -12,10 +12,10 @@
"EnableTesting": false,
"EnableDeveloper": false,
"EnableSecurityFixAlert": true,
"SessionLengthWebInDays" : 30,
"SessionLengthMobileInDays" : 30,
"SessionLengthSSOInDays" : 30,
"SessionCacheInMinutes" : 10
"SessionLengthWebInDays": 30,
"SessionLengthMobileInDays": 30,
"SessionLengthSSOInDays": 30,
"SessionCacheInMinutes": 10
},
"TeamSettings": {
"SiteName": "Mattermost",
......@@ -107,5 +107,28 @@
"AuthEndpoint": "",
"TokenEndpoint": "",
"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 @@
package manualtesting
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/api"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
......
......@@ -4,7 +4,7 @@
package manualtesting
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......
......@@ -17,7 +17,7 @@ import (
"syscall"
"time"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/api"
"github.com/mattermost/platform/manualtesting"
"github.com/mattermost/platform/model"
......
......@@ -5,8 +5,8 @@ package model
import (
"bytes"
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"io/ioutil"
"net/http"
"net/url"
......
......@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/go-gorp/gorp"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
......
......@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......
......@@ -4,7 +4,6 @@
package store
import (
l4g "code.google.com/p/log4go"
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
......@@ -16,6 +15,7 @@ import (
"encoding/json"
"errors"
"fmt"
l4g "github.com/alecthomas/log4go"
"io"
sqltrace "log"
"math/rand"
......
......@@ -4,7 +4,7 @@
package store
import (
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"time"
)
......
......@@ -11,7 +11,7 @@ import (
"path/filepath"
"strconv"
l4g "code.google.com/p/log4go"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
)
......@@ -77,7 +77,9 @@ func configureLog(s *model.LogSettings) {
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 {
......
......@@ -4,10 +4,10 @@
package utils
import (
l4g "code.google.com/p/log4go"
"crypto/tls"
"encoding/base64"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/model"
"net"
"net/mail"
......
......@@ -4,8 +4,8 @@
package web
import (
l4g "code.google.com/p/log4go"
"fmt"
l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/api"
"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