diff options
| -rw-r--r-- | .rr.yaml | 26 | ||||
| -rw-r--r-- | go.mod | 40 | ||||
| -rw-r--r-- | go.sum | 84 | ||||
| -rw-r--r-- | lib/roadrunner_test.go | 27 | ||||
| -rw-r--r-- | schemas/config/2.0.schema.json | 27 |
5 files changed, 118 insertions, 86 deletions
@@ -1102,15 +1102,6 @@ reload: nats: addr: "demo.nats.io" -# Boltdb jobs driver -# -# This option is required to use boltdb driver -boltdb: - # Permissions for hte boltdb database file - # - # This option is optional. Default: 0777 - permissions: 0777 - # AMQP jobs driver # # This option is required to use AMQP driver @@ -1258,20 +1249,25 @@ jobs: # # Should not be empty config: - # BoldDB file to create or DB to use + # Number of job to prefetch from the driver. # - # Default: "rr.db" - file: "path/to/rr.db" + # Default: 100_000. + prefetch: 10000 # Pipeline priority # # If the job has priority set to 0, it will inherit the pipeline's priority. Default: 10. priority: 10 - # Number of job to prefetch from the driver. + # BoldDB file to create or DB to use # - # Default: 100_000. - prefetch: 10000 + # Default: "rr.db" + file: "path/to/rr.db" + + # Permissions for the boltdb database file + # + # This option is optional. Default: 0777 + permissions: 0777 test-local-2: # Driver name @@ -5,17 +5,17 @@ go 1.19 require ( github.com/buger/goterm v1.0.4 github.com/dustin/go-humanize v1.0.1 - github.com/fatih/color v1.13.0 + github.com/fatih/color v1.14.1 github.com/joho/godotenv v1.4.0 github.com/olekukonko/tablewriter v0.0.5 - github.com/roadrunner-server/amqp/v4 v4.0.0 - github.com/roadrunner-server/api/v3 v3.2.0 + github.com/roadrunner-server/amqp/v4 v4.1.0 + github.com/roadrunner-server/api/v3 v3.2.1 github.com/roadrunner-server/app-logger/v4 v4.0.0 - github.com/roadrunner-server/beanstalk/v4 v4.0.0 - github.com/roadrunner-server/boltdb/v4 v4.0.0 + github.com/roadrunner-server/beanstalk/v4 v4.1.0 + github.com/roadrunner-server/boltdb/v4 v4.1.0 github.com/roadrunner-server/centrifuge/v4 v4.0.0 - github.com/roadrunner-server/config/v4 v4.0.0 - github.com/roadrunner-server/endure/v2 v2.0.0 + github.com/roadrunner-server/config/v4 v4.1.0 + github.com/roadrunner-server/endure/v2 v2.0.1 github.com/roadrunner-server/errors v1.2.0 github.com/roadrunner-server/fileserver/v4 v4.0.0 github.com/roadrunner-server/goridge/v3 v3.6.2 @@ -24,13 +24,13 @@ require ( github.com/roadrunner-server/headers/v4 v4.0.0 github.com/roadrunner-server/http/v4 v4.0.0 github.com/roadrunner-server/informer/v4 v4.0.0 - github.com/roadrunner-server/jobs/v4 v4.1.0 - github.com/roadrunner-server/kv/v4 v4.0.0 + github.com/roadrunner-server/jobs/v4 v4.2.0 + github.com/roadrunner-server/kv/v4 v4.1.0 github.com/roadrunner-server/logger/v4 v4.0.0 - github.com/roadrunner-server/memcached/v4 v4.0.0 - github.com/roadrunner-server/memory/v4 v4.0.0 + github.com/roadrunner-server/memcached/v4 v4.1.1 + github.com/roadrunner-server/memory/v4 v4.1.0 github.com/roadrunner-server/metrics/v4 v4.0.0 - github.com/roadrunner-server/nats/v4 v4.0.0 + github.com/roadrunner-server/nats/v4 v4.1.0 github.com/roadrunner-server/otel/v4 v4.0.0 github.com/roadrunner-server/prometheus/v4 v4.0.0 github.com/roadrunner-server/proxy_ip_parser/v4 v4.0.0 @@ -42,7 +42,7 @@ require ( github.com/roadrunner-server/send/v4 v4.0.0 github.com/roadrunner-server/server/v4 v4.0.0 github.com/roadrunner-server/service/v4 v4.0.2 - github.com/roadrunner-server/sqs/v4 v4.0.0 + github.com/roadrunner-server/sqs/v4 v4.1.0 github.com/roadrunner-server/static/v4 v4.0.0 github.com/roadrunner-server/status/v4 v4.0.0 github.com/roadrunner-server/tcp/v4 v4.0.0 @@ -58,17 +58,17 @@ require ( require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.8 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.9 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.18.1 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/beanstalkd/go-beanstalk v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -97,10 +97,9 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.15.14 // indirect + github.com/klauspost/compress v1.15.15 // indirect github.com/klauspost/cpuid/v2 v2.2.3 // indirect github.com/libdns/libdns v0.2.1 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -128,6 +127,7 @@ require ( github.com/prometheus/procfs v0.9.0 // indirect github.com/rabbitmq/amqp091-go v1.6.0 // indirect github.com/rivo/uniseg v0.4.3 // indirect + github.com/roadrunner-server/api/v4 v4.0.0 // indirect github.com/roadrunner-server/tcplisten v1.2.1 // indirect github.com/robfig/cron v1.2.0 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -180,7 +180,7 @@ require ( golang.org/x/text v0.6.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.5.0 // indirect - google.golang.org/genproto v0.0.0-20230119192704-9d59e20e5cd1 // indirect + google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197 // indirect google.golang.org/grpc v1.52.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect @@ -394,10 +394,10 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/PgrhY= github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= -github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= -github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= -github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= +github.com/aws/aws-sdk-go-v2/config v1.18.9 h1:pd+QUO1dvro6vGOuhgglJV6adGunU95xSTSzsQGhKpY= +github.com/aws/aws-sdk-go-v2/config v1.18.9/go.mod h1:2Lx9yaA/McDeQS8ft+edKrmOd5ry1v1euFQ+oGwUxsM= +github.com/aws/aws-sdk-go-v2/credentials v1.13.9 h1:oxM/C8eXGsiHH+u0gZGo1++QTFPf+N5MUb1tfaaQMpU= +github.com/aws/aws-sdk-go-v2/credentials v1.13.9/go.mod h1:45DrDZTok50mEx4Uw59ym7n11Oy7G4gt0Pez2Z4ktAA= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= @@ -408,14 +408,14 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 h1:KeTxcGdNnQudb46oOl4d90f2I33 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= -github.com/aws/aws-sdk-go-v2/service/sqs v1.20.0 h1:tQoMg8i4nFAB70cJ4wiAYEiZRYo2P6uDmU2D6ys/igo= -github.com/aws/aws-sdk-go-v2/service/sqs v1.20.0/go.mod h1:jQhN5f4p3PALMNlUtfb/0wGIFlV7vGtJlPDVfxfNfPY= +github.com/aws/aws-sdk-go-v2/service/sqs v1.20.1 h1:JvO+TT1JhH8InfwOfgWAfIFo3H1cz5qW8WuIP8Y5d6s= +github.com/aws/aws-sdk-go-v2/service/sqs v1.20.1/go.mod h1:jQhN5f4p3PALMNlUtfb/0wGIFlV7vGtJlPDVfxfNfPY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= -github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.1 h1:q3xG67qnKp1gsYSJY5AtTvFKY2IlmGPGrTw/Wy8EjeQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.1/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beanstalkd/go-beanstalk v0.2.0 h1:6UOJugnu47uNB2jJO/lxyDgeD1Yds7owYi1USELqexA= @@ -478,8 +478,8 @@ github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go. github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= @@ -618,8 +618,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 h1:1JYBfzqrWPcCclBwxFCPAou9n+q86mfnu7NAeHfte7A= github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0/go.mod h1:YDZoGHuwE+ov0c8smSH49WLF3F2LaWnYYuDVd+EWrc0= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -644,8 +642,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc= -github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= +github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -662,11 +660,8 @@ github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis= github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -749,22 +744,24 @@ github.com/rabbitmq/amqp091-go v1.6.0/go.mod h1:wfClAtY0C7bOHxd3GjmF26jEHn+rR/0B github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/roadrunner-server/amqp/v4 v4.0.0 h1:11qtTTedzqViAXxlsXvmt4929pXEHChhMBTkrqWg/no= -github.com/roadrunner-server/amqp/v4 v4.0.0/go.mod h1:u0MLPgkkt7UblJuywXQFB12YYC4lOq6nH9RAc1X+qZI= -github.com/roadrunner-server/api/v3 v3.2.0 h1:6XIJD9bAhJMMHRGDZqt+RSZBuKzfYr7eWX/XKu7GtCQ= -github.com/roadrunner-server/api/v3 v3.2.0/go.mod h1:hlv546SS3tZVIDu68YekPCLS/82Y/AoS8Eu5xysvwBQ= +github.com/roadrunner-server/amqp/v4 v4.1.0 h1:WrGtDt3RAiJvXKUIerzOTm7la8CNgOyijaeGvNCorP0= +github.com/roadrunner-server/amqp/v4 v4.1.0/go.mod h1:nVUBXcLcRLHuVw3GElw1HA6KvvPaVk0BufDssadKzLk= +github.com/roadrunner-server/api/v3 v3.2.1 h1:N4rokKVkN8Phoodbqtil90G65t2BqIWvHCKaxIKajvs= +github.com/roadrunner-server/api/v3 v3.2.1/go.mod h1:hlv546SS3tZVIDu68YekPCLS/82Y/AoS8Eu5xysvwBQ= +github.com/roadrunner-server/api/v4 v4.0.0 h1:4zAnlMHp2BKgxxPSuPGQSVCMtPKX/R+/czWewpDkPak= +github.com/roadrunner-server/api/v4 v4.0.0/go.mod h1:tbk/rqlNiLFAchTKrXvsJ4boAg0qZmxyK8vWH2PlV8U= github.com/roadrunner-server/app-logger/v4 v4.0.0 h1:/6tRPnUFGJ+6vm4iTF9zeU2hHl10goUsF4khtE+uxHM= github.com/roadrunner-server/app-logger/v4 v4.0.0/go.mod h1:cWV6nWhwQmkyGZtefeWrqs59v0XTrQdm5B7y8ukFpQU= -github.com/roadrunner-server/beanstalk/v4 v4.0.0 h1:IY54AdzkM5kOWFC6tJ0kWC3sZumIxB1n4UKxtGmIaMg= -github.com/roadrunner-server/beanstalk/v4 v4.0.0/go.mod h1:WjjmFgM8tuEBjzLxqBHUojppdBrrQ/KM6L65UwY04Ak= -github.com/roadrunner-server/boltdb/v4 v4.0.0 h1:lrUSNYDBcOWLI/vC5efOEhM3pvr76QN7g/5x6sY6CXY= -github.com/roadrunner-server/boltdb/v4 v4.0.0/go.mod h1:VS2QlOfSit2fFGwwFe4H/Rz+jXanm3LlH667cVIhVIg= +github.com/roadrunner-server/beanstalk/v4 v4.1.0 h1:LJIFJiAGA4SBCTJ4LVIhPIhmCblyYIM1kbjYYNoTaUA= +github.com/roadrunner-server/beanstalk/v4 v4.1.0/go.mod h1:Ekpce6ise0aet/WJDregbecSho502uIgu9sKfce5/T4= +github.com/roadrunner-server/boltdb/v4 v4.1.0 h1:fj216Ow1CYLyn+wk1vfuw4FxTpF+j2KwmFXk/9UYAVk= +github.com/roadrunner-server/boltdb/v4 v4.1.0/go.mod h1:dVgez5eFAVivFeCEcycVT2fbb33dKbgESjXrkqmck3o= github.com/roadrunner-server/centrifuge/v4 v4.0.0 h1:0Ac7nS2Hv/EJ0tKnAUqu9U9rq02GABRoERWlIigFgN4= github.com/roadrunner-server/centrifuge/v4 v4.0.0/go.mod h1:rTkGOF4XBJxSKP9KNVudbiMBSLms03m4tp9ZgLpUvF8= -github.com/roadrunner-server/config/v4 v4.0.0 h1:53jeE+MWRdMxqR6LjEl5DyZmqHCT8bwWqxKtj0cEHqM= -github.com/roadrunner-server/config/v4 v4.0.0/go.mod h1:cLwOYXWHNoGjQJHn5scXPueFBc3acWecG13jiL7x3uw= -github.com/roadrunner-server/endure/v2 v2.0.0 h1:QHQZdNP8PjMm7A3W7vKVHsbTV3Gj4u+UirECKRVB+/s= -github.com/roadrunner-server/endure/v2 v2.0.0/go.mod h1:RDrC9SFlyCGqGA2v9SqFIA+EqWTFmPxafIb4SMeHCHM= +github.com/roadrunner-server/config/v4 v4.1.0 h1:EyM632R4qVeO9tvhNItffBZMIBtuw70D3oYpPyRWoAs= +github.com/roadrunner-server/config/v4 v4.1.0/go.mod h1:dlrCUD2OxFxCiaXXiKY+/OqIJKz3BZbtkBVnrtvGWks= +github.com/roadrunner-server/endure/v2 v2.0.1 h1:2greoQ669iCjsYNt14dwXXQGHAKDmLtFzL0OIE0ZATc= +github.com/roadrunner-server/endure/v2 v2.0.1/go.mod h1:RDrC9SFlyCGqGA2v9SqFIA+EqWTFmPxafIb4SMeHCHM= github.com/roadrunner-server/errors v1.2.0 h1:qBmNXt8Iex9QnYTjCkbJKsBZu2EtYkQCM06GUDcQBbI= github.com/roadrunner-server/errors v1.2.0/go.mod h1:z0ECxZp/dDa5RahtMcy4mBIavVxiZ9vwE5kByl7kFtY= github.com/roadrunner-server/fileserver/v4 v4.0.0 h1:DfkS9GaFc2MDOg92oNuD0y0aAv6IHAeEoFtYhKQ9m+8= @@ -781,20 +778,20 @@ github.com/roadrunner-server/http/v4 v4.0.0 h1:xKSnxPIY3iaEfdQV3ZZ6bzjpSAvJq1oOD github.com/roadrunner-server/http/v4 v4.0.0/go.mod h1:WByUBgK4W6HtkEAFIVVbYU40iPsD7VmUJkr+7WMdqno= github.com/roadrunner-server/informer/v4 v4.0.0 h1:D7mo8VsSat5DHsEmvySD0OXRT32IOcQjs3hBBAaB4b4= github.com/roadrunner-server/informer/v4 v4.0.0/go.mod h1:jZRhcXHWyp1Wz/KbHgOHKxxATQkST7qL1omVLFN7tog= -github.com/roadrunner-server/jobs/v4 v4.1.0 h1:/1e4V5oMyxFgugVKzSl1a7TLQFiV1LF+m34PWaS2x2I= -github.com/roadrunner-server/jobs/v4 v4.1.0/go.mod h1:pU/nnMpQ+Kb37bqG6hURnECtSaFlZrCnUa7SHaO4HCg= -github.com/roadrunner-server/kv/v4 v4.0.0 h1:Qk+klLcxmjWfLtt2KfRtx1klMPOKfxwbZ1rm7hdx39k= -github.com/roadrunner-server/kv/v4 v4.0.0/go.mod h1:98OUw5ulDg6P/dItp7S4A1YxALeND2eZtAq91tqyb60= +github.com/roadrunner-server/jobs/v4 v4.2.0 h1:rQqHO2D9qRrxaZbSJvXnrvcSZFLQJNCLskDbewDkMsg= +github.com/roadrunner-server/jobs/v4 v4.2.0/go.mod h1:oR+ARIW4oGLB+11Mn8Uk3OtLf44fGVluAoFQJEC18/0= +github.com/roadrunner-server/kv/v4 v4.1.0 h1:Em7VypWeNMlZ3PQweMJHxXD3xSQAN3shryIrb0yibPg= +github.com/roadrunner-server/kv/v4 v4.1.0/go.mod h1:OkPP8M2xqas1JpzlwkvP/CrRhr9+lVHkLI3QATA1MD0= github.com/roadrunner-server/logger/v4 v4.0.0 h1:IH0rA4klye0yqEtTNkkd6ScAa1HrD8w3CRrs1juC6PY= github.com/roadrunner-server/logger/v4 v4.0.0/go.mod h1:p2bTOmH6dmD3WPkFzDrO4jmDxbd/s2rxXY6EO6RFdbY= -github.com/roadrunner-server/memcached/v4 v4.0.0 h1:l6abHUJsSy1YwJGqam2OwyO3oFHgVRErsTKNnaiyuV8= -github.com/roadrunner-server/memcached/v4 v4.0.0/go.mod h1:bN4aRV6pdQ2NiKiDIEs/4ZvRjBwe3mY/vCTUO64T6Pg= -github.com/roadrunner-server/memory/v4 v4.0.0 h1:XgfXcQgGQkCalxlLzuga61y9aii7kq0ddMWvhIUCIPg= -github.com/roadrunner-server/memory/v4 v4.0.0/go.mod h1:w9mFsfKXeBnDbbAchW0QgO7Sq2ZRVtFALnDQTrFztAg= +github.com/roadrunner-server/memcached/v4 v4.1.1 h1:f6lNgb1oHMRvlYlyBlUDz0Ei0ZBSlRjLfniLfQILa9I= +github.com/roadrunner-server/memcached/v4 v4.1.1/go.mod h1:td60kmGDWVHL7Wku4tz7JpV6d4xJ5w43uIaFfVzzFg8= +github.com/roadrunner-server/memory/v4 v4.1.0 h1:06ctmj6FXAVxcQVlC1pYiVGHMHg7D+4azZJW9DR37zU= +github.com/roadrunner-server/memory/v4 v4.1.0/go.mod h1:S8vKQmpu7fjGl0xSJcWkuoZyF0JMLoArlmniGcYP8uk= github.com/roadrunner-server/metrics/v4 v4.0.0 h1:Yuh2/b0iih1aTDueJvBaeNIhT7pmvvwOTA7WRu1TLL8= github.com/roadrunner-server/metrics/v4 v4.0.0/go.mod h1:+PoWwf2Mjq1Axi/CWEwbegvGxY7Kjr52YC5bXsxq3k8= -github.com/roadrunner-server/nats/v4 v4.0.0 h1:ARJAPrUK+rCr2o8BKP5IbwOfbJ3OlTiLhcvPkwWU6FE= -github.com/roadrunner-server/nats/v4 v4.0.0/go.mod h1:TN91TFJOLCn/fJeYdS0qbsORymlDuJ6QqQDCdP2J+jA= +github.com/roadrunner-server/nats/v4 v4.1.0 h1:208fC+HKN1kmX/POhJTuzIuUvqCeCwdl9b/iVD81JzY= +github.com/roadrunner-server/nats/v4 v4.1.0/go.mod h1:m0XK3VLzbAiww8cpG9/qSwX335pFWcmxYoykpg/NUXg= github.com/roadrunner-server/otel/v4 v4.0.0 h1:czxmPJL+tkwqX0rfL0gIptygdE+FUKsxnm6QLADUAts= github.com/roadrunner-server/otel/v4 v4.0.0/go.mod h1:7Qap+MrqNsaYG34r4SAE5xq3128Ew/K79Zms9MDEsxU= github.com/roadrunner-server/prometheus/v4 v4.0.0 h1:L3U7GR+1AlE6v/X6aIt155z7N0OCXJiqncg65xBVR8Q= @@ -817,8 +814,8 @@ github.com/roadrunner-server/server/v4 v4.0.0 h1:S5YhlvpiNS+FTWjBM9hsVonCXteUGnI github.com/roadrunner-server/server/v4 v4.0.0/go.mod h1:pskfIK77QvJui9a6z9WNpikuTV2OLPoiiB+7eYrkQ3E= github.com/roadrunner-server/service/v4 v4.0.2 h1:uSeHJsnaJI/AEiVEwFxvKwadTAHQbJTInXRbwFHwvBM= github.com/roadrunner-server/service/v4 v4.0.2/go.mod h1:ACrVtE4LjPAFWl6grDTTE4rHP84QEVFPlyFjlUIiIs8= -github.com/roadrunner-server/sqs/v4 v4.0.0 h1:askwmur5SIVgnB1UzSXzuTP70FBlXWqiK8X652cE30A= -github.com/roadrunner-server/sqs/v4 v4.0.0/go.mod h1:G7fqmSyrcFBGmpRakttpLvmWM00WDQWp53lSUstbDow= +github.com/roadrunner-server/sqs/v4 v4.1.0 h1:9yNui537zLXtHpA6sX0VfETj2gzT01M55XXkoWbD52k= +github.com/roadrunner-server/sqs/v4 v4.1.0/go.mod h1:TDDBYz09MC+ToTSTs1RzQCOeu3pDpEDOYLtmneUsGI0= github.com/roadrunner-server/static/v4 v4.0.0 h1:23yfaUwVYc7BKmFk3HLU4m6MVrfgb5zcM59GOhMOAS4= github.com/roadrunner-server/static/v4 v4.0.0/go.mod h1:AXN8DCov81ZdW8m1uVpYMD84zJXS4NlHWOucXpEnS1w= github.com/roadrunner-server/status/v4 v4.0.0 h1:tvvf/ZBYThzG1zFw/cZGR9TC61aXX+MzC6fRMppQIv4= @@ -1146,7 +1143,6 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1474,8 +1470,8 @@ google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZV google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230119192704-9d59e20e5cd1 h1:wSjSSQW7LuPdv3m1IrSN33nVxH/kID6OIKy+FMwGB2k= -google.golang.org/genproto v0.0.0-20230119192704-9d59e20e5cd1/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197 h1:BwjeHhu4HS48EZmu1nS7flldBIDPC3qn+HqaSQ1K4x8= +google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= diff --git a/lib/roadrunner_test.go b/lib/roadrunner_test.go index 42d0964d..4c603c23 100644 --- a/lib/roadrunner_test.go +++ b/lib/roadrunner_test.go @@ -16,6 +16,16 @@ func TestNewFailsOnMissingConfig(t *testing.T) { assert.NotNil(t, err) } +const testConfigWithVersion = ` +version: "2.7" +server: + command: "php src/index.php" + relay: "pipes" + +endure: + grace_period: 1s +` + const testConfig = ` server: command: "php src/index.php" @@ -33,12 +43,21 @@ func makeConfig(t *testing.T, configYaml string) string { return cfgFile } -func TestNewWithConfig(t *testing.T) { +func TestNewWithOldConfig(t *testing.T) { cfgFile := makeConfig(t, testConfig) + _, err := lib.NewRR(cfgFile, []string{}, lib.DefaultPluginsList()) + assert.Error(t, err) + + t.Cleanup(func() { + _ = os.Remove(cfgFile) + }) +} + +func TestNewWithConfig(t *testing.T) { + cfgFile := makeConfig(t, testConfigWithVersion) rr, err := lib.NewRR(cfgFile, []string{}, lib.DefaultPluginsList()) assert.NoError(t, err) - - assert.Equal(t, "2", string(rr.Version[0])) + assert.Equal(t, 0, len(rr.Version)) t.Cleanup(func() { _ = os.Remove(cfgFile) @@ -46,7 +65,7 @@ func TestNewWithConfig(t *testing.T) { } func TestServeStop(t *testing.T) { - cfgFile := makeConfig(t, testConfig) + cfgFile := makeConfig(t, testConfigWithVersion) plugins := []any{ &informer.Plugin{}, &resetter.Plugin{}, diff --git a/schemas/config/2.0.schema.json b/schemas/config/2.0.schema.json index 55c46823..7081d318 100644 --- a/schemas/config/2.0.schema.json +++ b/schemas/config/2.0.schema.json @@ -1287,9 +1287,6 @@ "nats": { "$ref": "#/definitions/NATS_J" }, - "boltdb": { - "$ref": "#/definitions/BoltDB_J" - }, "kafka": { "$ref": "#/definitions/KAFKA_J" }, @@ -1421,6 +1418,30 @@ "type": "integer", "default": 100000 }, + "permissions": { + "description": "Permissions for the boltdb database file", + "type": "integer", + "default": 777 + }, + "file": { + "description": "BoldDB file to create or DB to use", + "type": "string", + "default": "rr.db" + } + } + }, + { + "properties": { + "priority": { + "description": "Pipeline priority. If the job pushed to the pipeline has priority set to 0, it will inherit the pipeline's priority", + "type": "integer", + "default": 10 + }, + "prefetch": { + "description": "Number of job to prefetch from the driver", + "type": "integer", + "default": 100000 + }, "consume_all": { "description": "Consume all payloads, even not Job structured", "type": "boolean", |