Skip to content

feat: Add ssl option #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 22, 2023
Merged

feat: Add ssl option #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
469c976
feat: add ssl option
gui2dev Mar 21, 2023
d58d8ac
feat: set ssl according to option
gui2dev Mar 21, 2023
a41bd59
feat: latest version
gui2dev Mar 21, 2023
624d9b7
docs: add ssl option
gui2dev Mar 22, 2023
6051f80
fix: remove python 3.6 add python 3.10
gui2dev Mar 22, 2023
c201cf6
fix: fix CI script
hsluoyz Mar 22, 2023
c39ccde
fix: fix CI Node version
hsluoyz Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ 3.6, 3.7, 3.8, 3.9 ]
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
os: [ ubuntu-latest ]
services:
redis:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'

- name: Setup
run: npm install -g semantic-release @semantic-release/github @semantic-release/changelog @semantic-release/commit-analyzer @semantic-release/git @semantic-release/release-notes-generator semantic-release-pypi
Expand All @@ -101,4 +101,4 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
run: npx semantic-release
run: npx semantic-release
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if __name__ == "main":
test_option.host = "localhost"
test_option.port = "6379"
test_option.channel = "test"
test_option.ssl = False
test_option.optional_update_callback = callback_function
w = new_watcher(test_option)

Expand Down
1 change: 1 addition & 0 deletions casbin_redis_watcher/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class WatcherOptions:
password = None
host = "localhost"
port = "6379"
ssl = False
sub_client = None
pub_client = None
channel = None
Expand Down
4 changes: 2 additions & 2 deletions casbin_redis_watcher/watcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def unmarshal_binary(data: bytes):
def new_watcher(option: WatcherOptions):
option.init_config()
w = RedisWatcher()
rds = Redis(host=option.host, port=option.port, password=option.password)
rds = Redis(host=option.host, port=option.port, password=option.password, ssl=option.ssl)
if rds.ping() is False:
raise Exception("Redis server is not available.")
w.sub_client = rds.client().pubsub()
Expand All @@ -161,7 +161,7 @@ def new_watcher(option: WatcherOptions):
def new_publish_watcher(option: WatcherOptions):
option.init_config()
w = RedisWatcher()
rds = Redis(host=option.host, port=option.port, password=option.password)
rds = Redis(host=option.host, port=option.port, password=option.password, ssl=option.ssl)
if rds.ping() is False:
raise Exception("Redis server is not available.")
w.pub_client = rds.client()
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
casbin==1.16.8
redis==4.3.4
casbin==1.18.0
redis==4.5.2