Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9d39d6c

Browse files
coadlercoadler
committed
use fork
1 parent ec0b050 commit 9d39d6c

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

‎coderd/devtunnel/tunnel_frp.go renamed to ‎coderd/devtunnel/tunnel.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build frp
2-
// +build frp
3-
41
package devtunnel
52

63
import (
@@ -32,6 +29,8 @@ func New(ctx context.Context, coderurl *url.URL) (string, <-chan error, error) {
3229
cfg := frpconfig.GetDefaultClientConf()
3330
cfg.ServerAddr = "34.133.27.233"
3431
cfg.ServerPort = 7000
32+
cfg.LogWay = "file"
33+
cfg.LogFile = "/dev/null"
3534
cfg.LogLevel = "warn"
3635

3736
var (

‎coderd/devtunnel/tunnel_notfrp.go

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎coderd/devtunnel/tunnel_frp_test.go renamed to ‎coderd/devtunnel/tunnel_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build frp
2-
// +build frp
3-
41
package devtunnel_test
52

63
import (

‎go.mod

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ replace github.com/rivo/tview => github.com/kylecarbs/tview v0.0.0-2022030920223
3131
// glog has a single goroutine leak on start that we removed in a fork: https://github.com/coder/glog/pull/1.
3232
replace github.com/golang/glog => github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1
3333

34+
// kcp-go starts a goroutine in an init function that we can't stop. It was
35+
// fixed in our fork:
36+
// https://github.com/coder/kcp-go/commit/83c0904cec69dcf21ec10c54ea666bda18ada831
37+
replace github.com/fatedier/kcp-go => github.com/coder/kcp-go v2.0.4-0.20171016112434-21da33a6696d+incompatible
38+
3439
require (
3540
cdr.dev/slog v1.4.1
3641
cloud.google.com/go/compute v1.5.0
@@ -158,8 +163,6 @@ require (
158163
github.com/josharian/intern v1.0.0 // indirect
159164
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
160165
github.com/klauspost/compress v1.15.0 // indirect
161-
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
162-
github.com/klauspost/reedsolomon v1.9.15 // indirect
163166
github.com/kr/fs v0.1.0 // indirect
164167
github.com/leodido/go-urn v1.2.1 // indirect
165168
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -202,8 +205,11 @@ require (
202205
github.com/spf13/afero v1.8.1 // indirect
203206
github.com/spf13/cast v1.4.1 // indirect
204207
github.com/spf13/jwalterweatherman v1.1.0 // indirect
208+
github.com/templexxx/cpu v0.0.1 // indirect
205209
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
210+
github.com/templexxx/reedsolomon v1.1.3 // indirect
206211
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
212+
github.com/templexxx/xorsimd v0.1.1 // indirect
207213
github.com/tinylib/msgp v1.1.2 // indirect
208214
github.com/tjfoc/gmsm v1.4.1 // indirect
209215
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect

‎go.sum

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3K
311311
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
312312
github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1 h1:UqBrPWSYvRI2s5RtOul20JukUEpu4ip9u7biBL+ntgk=
313313
github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
314+
github.com/coder/kcp-go v2.0.4-0.20171016112434-21da33a6696d+incompatible h1:DMXeYJ/GtQzx9G1xjWvINZqoDyOTQDj0uGkZPV130OM=
315+
github.com/coder/kcp-go v2.0.4-0.20171016112434-21da33a6696d+incompatible/go.mod h1:sW9REGQSqLlZLRRby6CuuTsZ3FkqAEkGnrANKve7tzQ=
314316
github.com/coder/retry v1.3.0 h1:5lAAwt/2Cm6lVmnfBY7sOMXcBOwcwJhmV5QGSELIVWY=
315317
github.com/coder/retry v1.3.0/go.mod h1:tXuRgZgWjUnU5LZPT4lJh4ew2elUhexhlnXzrJWdyFY=
316318
github.com/confluentinc/confluent-kafka-go v1.4.0/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg=
@@ -532,8 +534,6 @@ github.com/fatedier/frp v0.41.0 h1:KIOzLlrWqEZZ9b9eVT8SSSgx4If47gMTAttaEz10l4o=
532534
github.com/fatedier/frp v0.41.0/go.mod h1:3Mp3fWvK8kD3PU8Hy89fKV/655Q5eFSHr+uuUr/lbOg=
533535
github.com/fatedier/golib v0.1.1-0.20220321042308-c306138b83ac h1:td1FJwN/oz8+9GldeEm3YdBX0Husc0FSPywLesZxi4w=
534536
github.com/fatedier/golib v0.1.1-0.20220321042308-c306138b83ac/go.mod h1:fLV0TLwHqrnB/L3jbNl67Gn6PCLggDGHniX1wLrA2Qo=
535-
github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible h1:ssXat9YXFvigNge/IkkZvFMn8yeYKFX+uI6wn2mLJ74=
536-
github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible/go.mod h1:YpCOaxj7vvMThhIQ9AfTOPW2sfztQR5WDfs7AflSy4s=
537537
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
538538
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
539539
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
@@ -1077,10 +1077,8 @@ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
10771077
github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
10781078
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
10791079
github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
1080-
github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
10811080
github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
10821081
github.com/klauspost/crc32 v1.2.0/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
1083-
github.com/klauspost/reedsolomon v1.9.15 h1:g2erWKD2M6rgnPf89fCji6jNlhMKMdXcuNHMW1SYCIo=
10841082
github.com/klauspost/reedsolomon v1.9.15/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk=
10851083
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
10861084
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1577,10 +1575,16 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP
15771575
github.com/tabbed/pqtype v0.1.1 h1:PhEcb9JZ8jr7SUjJDFjRPxny0M8fkXZrxn/a9yQfoZg=
15781576
github.com/tabbed/pqtype v0.1.1/go.mod h1:HLt2kLJPcUhODQkYn3mJkMHXVsuv3Z2n5NZEeKXL0Uk=
15791577
github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
1578+
github.com/templexxx/cpu v0.0.1 h1:hY4WdLOgKdc8y13EYklu9OUTXik80BkxHoWvTO6MQQY=
1579+
github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk=
15801580
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU=
15811581
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
1582+
github.com/templexxx/reedsolomon v1.1.3 h1:UJZtgOAcp8Ldl9Qp9/8YIPHfW58vsUrPHcJYv15Na50=
1583+
github.com/templexxx/reedsolomon v1.1.3/go.mod h1:lCyQlNrc8GTWsFE47kSLkJJvsGL8Lo5pfUDPiJZMm3o=
15821584
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI=
15831585
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
1586+
github.com/templexxx/xorsimd v0.1.1 h1:Y4e8YgMx/4xRJO4G6lq0bSswfDCxbIrGu7KqM2ET524=
1587+
github.com/templexxx/xorsimd v0.1.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo=
15841588
github.com/tidwall/assert v0.1.0/go.mod h1:QLYtGyeqse53vuELQheYl9dngGCJQ+mTtlxcktb+Kj8=
15851589
github.com/tidwall/btree v0.3.0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
15861590
github.com/tidwall/btree v1.1.0/go.mod h1:TzIRzen6yHbibdSfK6t8QimqbUnoxUSrZfeW7Uob0q4=
@@ -1665,7 +1669,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
16651669
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
16661670
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
16671671
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
1668-
github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E=
16691672
github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0=
16701673
github.com/yashtewari/glob-intersection v0.1.0 h1:6gJvMYQlTDOL3dMsPF6J0+26vwX9MB8/1q3uAdhmTrg=
16711674
github.com/yashtewari/glob-intersection v0.1.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=

0 commit comments

Comments
 (0)