extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-18 03:01:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes from video (#235)

Browse Source
This commit is contained in:
Michael Quigley 2023-04-05 13:57:22 -04:00 committed by Kenneth Bingham
parent 779f88d3e2
commit 72b7829d3e
No known key found for this signature in database
GPG Key ID: 31709281860130B6
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
controller/limits/agent.go
View File

@ -70,13 +70,17 @@ func (a *Agent) Stop() {
func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) { func (a *Agent) CanCreateEnvironment(acctId int, trx *sqlx.Tx) (bool, error) {
if a.cfg.Enforcing { if a.cfg.Enforcing {
alj, err := a.str.FindLatestAccountLimitJournal(acctId, trx) if empty, err := a.str.IsAccountLimitJournalEmpty(acctId, trx); err == nil && !empty {
if err != nil { alj, err := a.str.FindLatestAccountLimitJournal(acctId, trx)
if err != nil {
return false, err
}
if alj.Action == store.LimitAction {
return false, nil
}
} else if err != nil {
return false, err return false, err
} }
if alj.Action == store.LimitAction {
return false, nil
}
if a.cfg.Environments > Unlimited { if a.cfg.Environments > Unlimited {
envs, err := a.str.FindEnvironmentsForAccount(acctId, trx) envs, err := a.str.FindEnvironmentsForAccount(acctId, trx)

2
controller/metrics/amqpSink.go
View File

@ -6,6 +6,7 @@ import (
"github.com/openziti/zrok/controller/env" "github.com/openziti/zrok/controller/env"
"github.com/pkg/errors" "github.com/pkg/errors"
amqp "github.com/rabbitmq/amqp091-go" amqp "github.com/rabbitmq/amqp091-go"
"github.com/sirupsen/logrus"
"time" "time"
) )
@ -57,6 +58,7 @@ func newAmqpSink(cfg *AmqpSinkConfig) (*amqpSink, error) {
func (s *amqpSink) Handle(event ZitiEventJson) error { func (s *amqpSink) Handle(event ZitiEventJson) error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
logrus.Infof("pushing '%v'", event)
return s.ch.PublishWithContext(ctx, "", s.queue.Name, false, false, amqp.Publishing{ return s.ch.PublishWithContext(ctx, "", s.queue.Name, false, false, amqp.Publishing{
ContentType: "application/json", ContentType: "application/json",
Body: []byte(event), Body: []byte(event),

6
controller/store/sql/postgresql/010_v0_4_0_frontend_private_share.sql
View File

@ -14,7 +14,7 @@ create table frontends (
reserved boolean not null default(false), reserved boolean not null default(false),
created_at timestamptz not null default(current_timestamp), created_at timestamptz not null default(current_timestamp),
updated_at timestamptz not null default(current_timestamp), updated_at timestamptz not null default(current_timestamp),
deleted boolean not null default(false), deleted boolean not null default(false)
); );
insert into frontends (id, environment_id, token, z_id, url_template, public_name, reserved, created_at, updated_at, deleted) insert into frontends (id, environment_id, token, z_id, url_template, public_name, reserved, created_at, updated_at, deleted)
@ -25,7 +25,7 @@ select setval('frontends_id_seq', (select max(id) from frontends));
drop table frontends_old; drop table frontends_old;
alter index frontends_pkey1 rename to frontends_pkey; alter index frontends_pkey1 rename to frontends_pkey;
alter index frontends_public_name_key1 to frontends_public_name_key; alter index frontends_public_name_key1 rename to frontends_public_name_key;
alter index frontends_token_key1 to frontends_token_key; alter index frontends_token_key1 rename to frontends_token_key;
alter table frontends rename constraint frontends_environment_id_fkey1 to frontends_environment_id_fkey; alter table frontends rename constraint frontends_environment_id_fkey1 to frontends_environment_id_fkey;