11 Commits

Author SHA1 Message Date
Dan Milne
59d3385d8a Remove code which generates a deprecation warning 2023-01-26 13:04:49 +11:00
Dan Milne
3d5c102c08 Merge upstream/master 2023-01-26 13:03:05 +11:00
Nick Elser
7bb28cc007 update some badges 2021-01-21 10:38:29 -08:00
Nick Elser
65cae9aa58 update changelog & version 2021-01-21 10:32:06 -08:00
Nick Elser
6b6eb4e590 Merge pull request #15 from doits/monotonic_time
use monotonic time for retry timeout check
2021-01-21 10:27:46 -08:00
Nick Elser
485f2bff37 Merge pull request #12 from mlarraz/redis_pool
Support connection pooled Redis
2021-01-21 10:25:56 -08:00
Matt Larraz
3a37a74982 Support connection pooled Redis 2021-01-20 16:47:30 -08:00
Nick Elser
b02c256c25 Merge pull request #16 from mlarraz/ruby_versions
Switch to Github Actions and update supported Ruby versions
2021-01-20 16:45:40 -08:00
Matt Larraz
d57f6a15ac Switch to Github Actions and update supported Ruby versions 2021-01-20 16:08:37 -08:00
Dan Milne
d293ef6fcf Allow Ruby 3 2021-01-11 11:29:17 +11:00
Markus Doits
6e74322ff1 use monotonic time for retry timeout check 2021-01-07 12:52:21 +01:00
9 changed files with 70 additions and 27 deletions

38
.github/workflows/CI.yml vendored Normal file
View File

@@ -0,0 +1,38 @@
name: CI
on:
push:
branches:
- master
pull_request:
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- ruby-head
continue-on-error: ${{ matrix.ruby == 'ruby-head' }}
services:
memcached:
image: memcached
ports:
- 11211:11211
redis:
image: redis
ports:
- 6379:6379
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: |
bundle exec rake

View File

@@ -1,9 +0,0 @@
language: ruby
rvm:
- 2.2.6
- 2.3.7
- 2.4.4
- 2.5.1
services:
- memcached
- redis-server

View File

@@ -1,3 +1,10 @@
## 0.4.0
- Monotonic clock for locks, avoiding issues with DST (thanks @doits)
- Pooled connection support (thanks @mlarraz)
- Switch to Github actions for tests (thanks @mlarraz)
- Update supported Ruby versions (thanks @mlarraz & @pat)
## 0.3.4
- Support for connection pooling when using memcached locks, via `with` blocks using Dalli (thanks to Lev).

View File

@@ -1,4 +1,4 @@
# Suo [![Build Status](https://travis-ci.org/nickelser/suo.svg?branch=master)](https://travis-ci.org/nickelser/suo) [![Code Climate](https://codeclimate.com/github/nickelser/suo/badges/gpa.svg)](https://codeclimate.com/github/nickelser/suo) [![Test Coverage](https://codeclimate.com/github/nickelser/suo/badges/coverage.svg)](https://codeclimate.com/github/nickelser/suo) [![Gem Version](https://badge.fury.io/rb/suo.svg)](http://badge.fury.io/rb/suo)
# Suo [![Build Status](https://github.com/nickelser/suo/workflows/CI/badge.svg)](https://github.com/nickelser/suo/actions?query=workflow%3ACI) [![Code Climate](https://codeclimate.com/github/nickelser/suo/badges/gpa.svg)](https://codeclimate.com/github/nickelser/suo) [![Gem Version](https://badge.fury.io/rb/suo.svg)](http://badge.fury.io/rb/suo)
:lock: Distributed semaphores using Memcached or Redis in Ruby.

View File

@@ -2,7 +2,6 @@ require "securerandom"
require "monitor"
require "dalli"
require "dalli/cas/client"
require "redis"

View File

@@ -132,10 +132,10 @@ module Suo
end
def retry_with_timeout
start = Time.now.to_f
start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
retry_count.times do
elapsed = Time.now.to_f - start
elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
break if elapsed >= options[:acquisition_timeout]
synchronize do

View File

@@ -9,21 +9,31 @@ module Suo
end
def clear
@client.del(@key)
with { |r| r.del(@key) }
end
private
def with(&block)
if @client.respond_to?(:with)
@client.with(&block)
else
yield @client
end
end
def get
[@client.get(@key), nil]
[with { |r| r.get(@key) }, nil]
end
def set(newval, _, expire: false)
ret = @client.multi do |multi|
ret = with do |r|
r.multi do |rr|
if expire
multi.setex(@key, @options[:ttl], newval)
rr.setex(@key, @options[:ttl], newval)
else
multi.set(@key, newval)
rr.set(@key, newval)
end
end
end
@@ -31,11 +41,9 @@ module Suo
end
def synchronize
@client.watch(@key) do
yield
end
with { |r| r.watch(@key) { yield } }
ensure
@client.unwatch
with { |r| r.unwatch }
end
def initial_set(val = BLANK_STR)

View File

@@ -1,3 +1,3 @@
module Suo
VERSION = "0.3.4".freeze
VERSION = "0.4.0".freeze
end

View File

@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]
spec.required_ruby_version = "~> 2.0"
spec.required_ruby_version = ">= 2.5"
spec.add_dependency "dalli"
spec.add_dependency "redis"
spec.add_dependency "msgpack"
spec.add_development_dependency "bundler"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rubocop", "~> 0.49.0"
spec.add_development_dependency "minitest", "~> 5.5.0"
spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4.7"