Skip to content

Commit

Permalink
Add the code to allow specifying a custom socket_file
Browse files Browse the repository at this point in the history
  • Loading branch information
Dwight Hubbard committed Apr 15, 2015
1 parent 2ebd1b4 commit 4c77b47
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
5 changes: 4 additions & 1 deletion redislite/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class RedisMixin(object):
dbdir = None
settingregistryfile = None
cleanupregistry = False
redis_server_config = {}

def _cleanup(self):
"""
Expand Down Expand Up @@ -240,6 +239,10 @@ def __init__(self, *args, **kwargs):
# noinspection PyArgumentList,PyPep8
return super(RedisMixin, self).__init__(*args, **kwargs) # pragma: no cover

self.socket_file = kwargs.get('unix_socket_path', None)
if self.socket_file and self.socket_file == os.path.basename(self.socket_file):
self.socket_file = os.path.join(os.getcwd(), self.socket_file)

db_filename = None
if args:
db_filename = args[0]
Expand Down
17 changes: 2 additions & 15 deletions tests/test_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,6 @@ def test_redislite_Redis_with_db_file_keyword(self):
self.assertTrue(os.path.exists(filename))
shutil.rmtree(temp_dir)

def test_redislite_Redis_with_serverconfig_dbfile_keyword(self):
temp_dir = tempfile.mkdtemp()
filename = os.path.join(temp_dir, 'redis.db')
self.assertFalse(os.path.exists(filename))
r = redislite.Redis(serverconfig_dbfilename=filename)
r.set('key', 'value')
result = r.get('key').decode(encoding='UTF-8')
self.assertEqual(result, 'value')
r.save()
r._cleanup()
self.assertTrue(os.path.exists(filename))
shutil.rmtree(temp_dir)

def test_redislite_Redis_multiple_connections(self):
# Generate a new redis server
r = redislite.Redis()
Expand Down Expand Up @@ -200,7 +187,7 @@ def test_redislite_redis_custom_socket_file_local_directory(self):
"""
socket_file_name = 'test.socket'
full_socket_file_name = os.path.join(os.getcwd(), socket_file_name)
r = redislite.Redis(serverconfig_socketfile=socket_file_name)
r = redislite.Redis(unix_socket_path=socket_file_name)
self.assertEqual(r.socket_file, full_socket_file_name)
print(os.listdir('.'))
mode = os.stat(socket_file_name).st_mode
Expand All @@ -214,7 +201,7 @@ def test_redislite_redis_custom_socket_file(self):
:return:
"""
socket_file_name = '/tmp/test.socket'
r = redislite.Redis(serverconfig_socketfile=socket_file_name)
r = redislite.Redis(unix_socket_path=socket_file_name)
self.assertEqual(r.socket_file, socket_file_name)
print(os.listdir('.'))
mode = os.stat(socket_file_name).st_mode
Expand Down

0 comments on commit 4c77b47

Please sign in to comment.