Skip to content

Commit

Permalink
提交
Browse files Browse the repository at this point in the history
  • Loading branch information
xiusin committed Apr 28, 2020
1 parent 0950f4c commit 4d766a0
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 29 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
redis管理客户端, 基于GO语言+Electron开发, 支持常见的数据结构的CRUD, TTL管理, 服务器信息显示, 慢日志查询.
还原`redis-cli`客户端(不依赖本地安装redis服务), 并且还原大部分响应结果,复杂的命令建议从cli, 支持发布订阅模式.

## TODO ##
- [ ] ~~键搜索, tree组件无法提供, 暂时不添加功能~~
- [ ] 替换类库为(https://github.com/zserge/lorca), 精简文件大小与依赖

4 changes: 1 addition & 3 deletions server/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ echo "构建可运行程序打包,请等待..."

cd server

astilectron-bundler -v

echo "打包已完成, 打开程序"
astilectron-bundler
21 changes: 13 additions & 8 deletions server/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,27 @@ go 1.13
require (
github.com/Luzifer/go-openssl v2.0.0+incompatible
github.com/Workiva/go-datastructures v1.0.50 // indirect
github.com/akavel/rsrc v0.9.0 // indirect
github.com/asticode/go-astikit v0.5.0 // indirect
github.com/asticode/go-astilectron v0.12.4
github.com/asticode/go-astilectron-bootstrap v0.3.0
github.com/asticode/go-astilectron-bundler v0.4.3 // indirect
github.com/asticode/go-astilog v1.4.0
github.com/asticode/go-astilectron v0.14.0
github.com/asticode/go-astilectron-bootstrap v0.3.4
github.com/asticode/go-astilog v1.7.0
github.com/coreos/etcd v3.3.18+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/gomodule/redigo v2.0.0+incompatible
github.com/gorilla/websocket v1.4.1
github.com/gorilla/websocket v1.4.2
github.com/json-iterator/go v1.1.9 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.11 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.8.1
github.com/pkg/errors v0.9.1
github.com/rs/cors v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
github.com/sirupsen/logrus v1.5.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/xiusin/logger v0.0.1
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 // indirect
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.7 // indirect
)
30 changes: 30 additions & 0 deletions server/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ github.com/Workiva/go-datastructures v1.0.50 h1:slDmfW6KCHcC7U+LP3DDBbm4fqTwZGn1
github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA=
github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/akavel/rsrc v0.9.0 h1:HwUDC0+tMFWqN4D5G+o5siGD4oVsC3jn6zM8ocjc3nY=
github.com/akavel/rsrc v0.9.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/asticode/go-astikit v0.2.0 h1:QonRVJKQB2btMYZGW+YkibMDOXje2F49RLW4UCnyjns=
github.com/asticode/go-astikit v0.2.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
github.com/asticode/go-astikit v0.4.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
Expand All @@ -13,14 +15,23 @@ github.com/asticode/go-astilectron v0.11.0 h1:oGDtvluHljJMZKc24cnV/EFaQz9+qMrIQZ
github.com/asticode/go-astilectron v0.11.0/go.mod h1:TZQGUq3VWlNBL7OSWa+U7KNDVPSxN0RfQnY/CLWvHjQ=
github.com/asticode/go-astilectron v0.12.4 h1:hmKFhefTlWJnXx8arymGZXjpF7RA38QbIJk/BEoumlE=
github.com/asticode/go-astilectron v0.12.4/go.mod h1:D5O16BpDty8+HDSLzOslGU7g8VOhbLd4+Rx1NDH4qi4=
github.com/asticode/go-astilectron v0.13.1/go.mod h1:D5O16BpDty8+HDSLzOslGU7g8VOhbLd4+Rx1NDH4qi4=
github.com/asticode/go-astilectron v0.14.0 h1:p75MRAmLrmPHKijOOt8syVnRpsAGakWgoHUNA6nALmQ=
github.com/asticode/go-astilectron v0.14.0/go.mod h1:D5O16BpDty8+HDSLzOslGU7g8VOhbLd4+Rx1NDH4qi4=
github.com/asticode/go-astilectron-bootstrap v0.3.0 h1:JqvVmu/Do4V1CAgKZMcAzL6TSf6ONsBfCUo7vUM8QpY=
github.com/asticode/go-astilectron-bootstrap v0.3.0/go.mod h1:j/fFeo5sxMnHesc3jD6doFMEa7nTqT/D2tMpnLMUTac=
github.com/asticode/go-astilectron-bootstrap v0.3.4 h1:Ncxw90ChHN60lPQ1h9o7QcubUTFX9vz4VeUkxKVJK0Y=
github.com/asticode/go-astilectron-bootstrap v0.3.4/go.mod h1:Ctnhn8jH8Q8cP3BnLfoHbwRD+RlyUBF1JoIAdz/Xoa4=
github.com/asticode/go-astilectron-bundler v0.3.0 h1:8Ja34ENKKnyd5frNuMhXg4eYMXHNNuENEwTHmgptW8Q=
github.com/asticode/go-astilectron-bundler v0.3.0/go.mod h1:9xfnWFGAYzbaRFqAv30XbYdsFnuk3EPOYUHSKI9Y+Pw=
github.com/asticode/go-astilectron-bundler v0.4.3 h1:S1FGjtS2Fcs0oBpkpjjPM8oXTgm2aW4/4iY3xYf5JH0=
github.com/asticode/go-astilectron-bundler v0.4.3/go.mod h1:c1fqhzmHR2vxsjsOqAZLkyYYpowOK5mZwER+jNosHEs=
github.com/asticode/go-astilectron-bundler v0.5.2 h1:JC4UBDr28vVY8gk4A/wag8BW0gvAd6z4MGUM/D7NXw4=
github.com/asticode/go-astilectron-bundler v0.5.2/go.mod h1:V1VInmdndq/Kd+45cOh4fa9fARNZSCpXqxDznbh+lO0=
github.com/asticode/go-astilog v1.4.0 h1:81eNYAC04VPg1b9UXdQe3NCT1EPo9CtGa2UUDnQyvik=
github.com/asticode/go-astilog v1.4.0/go.mod h1:0sGDwdYLRSFVbbvrXLbJC9niyGWL5JGTCEQWFJKHZr0=
github.com/asticode/go-astilog v1.7.0 h1:4wr84gUcy/72E0TscT+NakSCh4+OcBI6XicGdGS8Qxs=
github.com/asticode/go-astilog v1.7.0/go.mod h1:J1v/h9covqLlta1Nq5Fd+Gl4GICXyx3yXihux0iJmPo=
github.com/asticode/go-bindata v1.0.0 h1:5whO0unjdx2kbAbzoBMS3307jKAEf3oQ1lJcx5RdgA8=
github.com/asticode/go-bindata v1.0.0/go.mod h1:t/Y+/iCLrvaYkv8Y6PscRnyUeYzy9y9+8JC9CMcKdHY=
github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNNP3dXwIq1lE=
Expand All @@ -30,33 +41,44 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
Expand All @@ -65,17 +87,21 @@ github.com/sam-kamerer/go-plister v1.2.0 h1:ZdEF1bhPUoGzwz5eFljw2K/A+oRXq/81jul/
github.com/sam-kamerer/go-plister v1.2.0/go.mod h1:gTt1Ko2oTA5bfDYsNcLjRGyyx6LPxHIeo0ZTtTRZG2I=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/xiusin/logger v0.0.1 h1:d4T7vo34VFXfoAjfVSy76FaDM5VQidzJmvqqqdOn0kA=
github.com/xiusin/logger v0.0.1/go.mod h1:Cpe36We6KxRDbq643JbTm7hL5TgHWzCgrizLvteZ82Q=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e h1:egKlR8l7Nu9vHGWbcUV8lqR4987UfUbBd7GbhqGzNYU=
golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand All @@ -84,6 +110,10 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/p
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
19 changes: 9 additions & 10 deletions server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
bootstrap "github.com/asticode/go-astilectron-bootstrap"
"github.com/asticode/go-astilog"
"github.com/pkg/errors"
"github.com/xiusin/logger"
"github.com/xiusin/redis_manager/server/src"
"log"
"math/rand"
Expand All @@ -33,12 +34,10 @@ var secretKey []byte
func init() {
cacheDir = GetCacheDir()
getRandomKey()
astilog.SetLogger(astilog.New(astilog.Configuration{
AppName: "RedisDesktop",
Filename: fmt.Sprintf("%s/error.log", cacheDir),
Verbose: false,
}))

f,err := os.OpenFile(fmt.Sprintf("%s/error.log", cacheDir), os.O_APPEND|os.O_CREATE|os.O_WRONLY, os.ModePerm)
if err == nil {
logger.SetOutput(f)
}
astilog.FlagConfig()

var routes = map[string]src.HandleFunc{
Expand Down Expand Up @@ -88,7 +87,6 @@ func main() {
RestoreAssets: RestoreAssets,
AstilectronOptions: options,
Debug: DEBUG,
Logger: astilog.GetLogger(),
MenuOptions: nil,
OnWait: func(a *astilectron.Astilectron, ws []*astilectron.Window, _ *astilectron.Menu, _ *astilectron.Tray, _ *astilectron.Menu) error {
a.On(astilectron.EventNameAppCrash, func(e astilectron.Event) (deleteListener bool) {
Expand Down Expand Up @@ -119,11 +117,11 @@ func main() {
params := info[1]
s, err := opensslHandler.DecryptString(src.SecretKey, params)
if err != nil {
astilog.Errorf("Decrypt Error", err.Error())
logger.Errorf("Decrypt Error", err.Error())
return err.Error()
}
if err := json.Unmarshal(s, &data); err != nil {
astilog.Errorf("UnmarshalData Error", err.Error())
logger.Errorf("UnmarshalData Error", err.Error())
return err.Error()
}
}
Expand Down Expand Up @@ -151,7 +149,8 @@ func main() {
}

if err := bootstrap.Run(config); err != nil {
astilog.Fatal(errors.Wrap(err, "running bootstrap failed"))
logger.Errorf("%s", errors.Wrap(err, "running bootstrap failed"))
os.Exit(0)
}
}

Expand Down
4 changes: 2 additions & 2 deletions server/src/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/xiusin/logger"
"os"
"reflect"
"regexp"
Expand All @@ -14,7 +15,6 @@ import (
"time"

"github.com/asticode/go-astilectron"
"github.com/asticode/go-astilog"
"github.com/gorilla/websocket"

"github.com/gomodule/redigo/redis"
Expand Down Expand Up @@ -199,7 +199,7 @@ func RedisPubSub(data RequestData) string {
if ws != nil {
resultValue, _ := json.Marshal(&retData)
if err := ws.WriteMessage(websocket.TextMessage, resultValue); err != nil {
astilog.GetLogger().Error(err)
logger.Error(err)
return
}
} else if Window != nil {
Expand Down
4 changes: 2 additions & 2 deletions server/src/handler.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package src

import (
"github.com/asticode/go-astilog"
"github.com/xiusin/logger"
"runtime/debug"
"sync"
)
Expand All @@ -23,7 +23,7 @@ func (h *Handler) Handle(route string, data RequestData) string {
defer func() {
if err := recover(); err != nil {
s := debug.Stack()
astilog.Errorf("Recovered Error: %s, ErrorStack: \n%s\n\n", err, string(s))
logger.Errorf("Recovered Error: %s, ErrorStack: \n%s\n\n", err, string(s))
}
}()

Expand Down

0 comments on commit 4d766a0

Please sign in to comment.