Skip to content

Commit

Permalink
Feat 25 (#18)
Browse files Browse the repository at this point in the history
* fix: update grpc client
* fix: add cond expr
* fix: 完善信息
* fix: update protoc-gen-lava-errors
* fix: update http errors
  • Loading branch information
kooksee authored Jul 1, 2023
1 parent f2e5d44 commit b9eec91
Show file tree
Hide file tree
Showing 538 changed files with 13,412 additions and 83,424 deletions.
13 changes: 1 addition & 12 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
builds:
- main: ./cmd/lava/main.go
- main: ./cmds/lava/main.go
id: lava
binary: lava
env:
Expand All @@ -14,17 +14,6 @@ builds:
- -X 'github.com/pubgo/lava/version.BuildTime={{ .Date }}'
- -X 'github.com/pubgo/lava/version.CommitID={{ .Commit }}'
- -X 'github.com/pubgo/lava/version.Version={{ .Version }}'
- main: ./cmd/protoc-gen-errors/main.go
id: protoc-gen-errors
binary: protoc-gen-errors
env:
- CGO_ENABLED=0
goos:
- linux
- darwin
- windows
goarch:
- amd64
archives:
- name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
format: binary
Expand Down
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
WORKDIR=`pwd`
Domain=lava
Project=test-grpc
Base=github.com/pubgo/lava
Tag=$(shell git describe --abbrev=0 --tags)
Project=lava
Base=github.com/pubgo/funk
Version=$(shell git tag --sort=committerdate | tail -n 1)
BuildTime=$(shell date "+%F %T")
CommitID=$(shell git rev-parse --short=8 HEAD)
Expand All @@ -12,15 +10,12 @@ LDFLAGS=-ldflags " \
-X '${Base}/version.buildTime=${BuildTime}' \
-X '${Base}/version.commitID=${CommitID}' \
-X '${Base}/version.version=${Version:=v0.0.1-dev}' \
-X '${Base}/version.tag=${Tag}' \
-X '${Base}/version.domain=${Domain}' \
-X '${Base}/version.project=${Project}' \
-X '${Base}/version.data=hello' \
"

.PHONY: build
build:
go build ${LDFLAGS} -mod vendor -v -o main cmd/lava/main.go
go build ${LDFLAGS} -mod vendor -v -o bin/main cmd/lava/main.go

.PHONY: install
install:
Expand Down
81 changes: 0 additions & 81 deletions clients/bbolt/client.go

This file was deleted.

62 changes: 0 additions & 62 deletions clients/bbolt/config.go

This file was deleted.

9 changes: 0 additions & 9 deletions clients/etcdv3/client.go

This file was deleted.

53 changes: 0 additions & 53 deletions clients/etcdv3/config.go

This file was deleted.

2 changes: 1 addition & 1 deletion clients/grpcc/grpcc_lb/doc.go → clients/grpcc/_doc.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package grpcc_lb
package grpcc

// https://github.com/go-kratos/kratos/tree/main/selector
19 changes: 19 additions & 0 deletions clients/grpcc/aaa.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package grpcc

import (
"context"

"google.golang.org/grpc"

"github.com/pubgo/lava/clients/grpcc/grpcc_config"
)

const Name = "grpcc"

type Config = grpcc_config.Cfg

// Client grpc client interface
type Client interface {
grpc.ClientConnInterface
Healthy(ctx context.Context) error
}
Loading

0 comments on commit b9eec91

Please sign in to comment.