Skip to content

Commit 9323cc2

Browse files
ad3nad3n
committed
remove terminal color
1 parent 0562926 commit 9323cc2

5 files changed

Lines changed: 10 additions & 58 deletions

File tree

‎bima.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
const (
14-
Version = "v4.0.5"
14+
Version = "v4.0.6"
1515

1616
HighestPriority = 255
1717
LowestPriority = -255

‎dics/core.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/bimalabs/framework/v4/routers"
2222
"github.com/bimalabs/framework/v4/routes"
2323
"github.com/bimalabs/framework/v4/utils"
24-
"github.com/fatih/color"
2524
"github.com/kamva/mgm/v3"
2625
"github.com/sarulabs/dingo/v4"
2726
"go.mongodb.org/mongo-driver/event"
@@ -42,14 +41,12 @@ var Application = []dingo.Def{
4241
return &factory, nil
4342
}
4443

45-
util := color.New(color.FgCyan, color.Bold)
46-
var db drivers.Driver
47-
48-
util.Print("✓ ")
44+
fmt.Print("✓ ")
4945
fmt.Print("Database configured using ")
50-
util.Print(env.Db.Driver)
46+
fmt.Print(env.Db.Driver)
5147
fmt.Println(" driver")
5248

49+
var db drivers.Driver
5350
switch env.Db.Driver {
5451
case "mysql":
5552
db = drivers.Mysql{}

‎go.mod‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/ThreeDotsLabs/watermill-amqp v1.1.4
99
github.com/ThreeDotsLabs/watermill-kafka/v2 v2.2.2
1010
github.com/allegro/bigcache/v3 v3.0.2
11-
github.com/fatih/color v1.13.0
1211
github.com/gertd/go-pluralize v0.1.7
1312
github.com/go-playground/validator/v10 v10.11.0
1413
github.com/go-stack/stack v1.8.1 // indirect
@@ -22,7 +21,6 @@ require (
2221
github.com/jinzhu/now v1.1.5 // indirect
2322
github.com/kamva/mgm/v3 v3.4.1
2423
github.com/klauspost/compress v1.15.7 // indirect
25-
github.com/mattn/go-colorable v0.1.12 // indirect
2624
github.com/olivere/elastic/v7 v7.0.32
2725
github.com/rs/cors v1.8.2
2826
github.com/sarulabs/dingo/v4 v4.0.2

‎go.sum‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
100100
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
101101
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
102102
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
103-
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
104-
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
105103
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
106104
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
107105
github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns=
@@ -393,14 +391,9 @@ github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsI
393391
github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
394392
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
395393
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
396-
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
397-
github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
398-
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
399394
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
400395
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
401396
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
402-
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
403-
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
404397
github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
405398
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
406399
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -706,9 +699,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
706699
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
707700
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
708701
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
709-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
710702
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
711-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
712703
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
713704
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
714705
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo=

‎middlewares/middleware.go‎

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"net/url"
88
"reflect"
99
"sort"
10+
"strconv"
1011
"strings"
1112
"time"
1213

1314
"github.com/bimalabs/framework/v4/loggers"
14-
"github.com/fatih/color"
1515

1616
"github.com/CAFxX/httpcompression"
1717
"github.com/CAFxX/httpcompression/contrib/andybalholm/brotli"
@@ -106,50 +106,16 @@ func (m *Factory) Attach(handler http.Handler) http.Handler {
106106

107107
elapsed := time.Since(start)
108108

109-
var statusCode string
110109
uri, _ := url.QueryUnescape(request.RequestURI)
111-
mGet := color.New(color.BgHiGreen, color.FgBlack)
112-
mPost := color.New(color.BgYellow, color.FgBlack)
113-
mPut := color.New(color.BgCyan, color.FgBlack)
114-
mDelete := color.New(color.BgRed, color.FgBlack)
115-
116-
switch request.Method {
117-
case http.MethodPost:
118-
mPost.Print("[POST]")
119-
case http.MethodPatch:
120-
mPost.Print("[PATCH]")
121-
case http.MethodPut:
122-
mPut.Print("[PUT]")
123-
case http.MethodDelete:
124-
mDelete.Print("[DELETE]")
125-
default:
126-
mGet.Print("[GET]")
127-
}
128-
129-
switch {
130-
case wrapper.StatusCode() < 300:
131-
statusCode = color.New(color.FgGreen, color.Bold).Sprintf("%d", wrapper.StatusCode())
132-
case wrapper.StatusCode() < 400:
133-
statusCode = color.New(color.FgYellow, color.Bold).Sprintf("%d", wrapper.StatusCode())
134-
default:
135-
statusCode = color.New(color.FgRed, color.Bold).Sprintf("%d", wrapper.StatusCode())
136-
}
137-
138-
var elapsedString string
139-
switch {
140-
case elapsed.Seconds() < 1.00:
141-
elapsedString = color.New(color.FgGreen, color.Bold).Sprint(elapsed)
142-
case elapsed.Seconds() < 5.00:
143-
elapsedString = color.New(color.FgYellow, color.Bold).Sprint(elapsed)
144-
case elapsed.Seconds() > 5.00:
145-
elapsedString = color.New(color.FgRed, color.Bold).Sprint(elapsed)
146-
}
147110

148111
var stdLog strings.Builder
112+
stdLog.WriteString("[")
113+
stdLog.WriteString(request.Method)
114+
stdLog.WriteString("]")
149115
stdLog.WriteString("\t")
150-
stdLog.WriteString(statusCode)
116+
stdLog.WriteString(strconv.Itoa(wrapper.StatusCode()))
151117
stdLog.WriteString("\t")
152-
stdLog.WriteString(elapsedString)
118+
stdLog.WriteString(elapsed.String())
153119
stdLog.WriteString("\t")
154120
stdLog.WriteString(uri)
155121

0 commit comments

Comments
 (0)