Skip to content

Commit d7eff44

Browse files
committed
Decrease unix socket filename length
See tarantool/tarantool#6365 for details about possible problems and the description how it occurs. We're going to use tags like 2.10.0-beta1 and so the build directory path under rpmbuild will be even longer than before. So we should decrease the absolute path length of a unix socket and so it worth to trim the basename. Of course, sooner or later we should elaborate a full solution.
1 parent ab453e3 commit d7eff44

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/app_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def deploy(self, vardir=None, silent=True, need_init=True):
154154
continue
155155
raise
156156
if self.use_unix_sockets_iproto:
157-
path = os.path.join(self.vardir, self.name + ".socket-iproto")
157+
path = os.path.join(self.vardir, self.name + ".i")
158158
warn_unix_socket(path)
159159
self.iproto = path
160160
else:

lib/tarantool_server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,14 +718,14 @@ def install(self, silent=True):
718718
self.copy_files()
719719

720720
if self.use_unix_sockets:
721-
path = os.path.join(self.vardir, self.name + ".socket-admin")
721+
path = os.path.join(self.vardir, self.name + ".c")
722722
warn_unix_socket(path)
723723
self._admin = path
724724
else:
725725
self._admin = find_port()
726726

727727
if self.use_unix_sockets_iproto:
728-
path = os.path.join(self.vardir, self.name + ".socket-iproto")
728+
path = os.path.join(self.vardir, self.name + ".i")
729729
warn_unix_socket(path)
730730
self._iproto = path
731731
else:

listeners.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def save_artifacts(self):
221221
shutil.copytree(os.path.join(vardir, worker_name),
222222
os.path.join(artifacts_dir, worker_name),
223223
ignore=shutil.ignore_patterns(
224-
'*.socket-iproto', '*.socket-admin',
224+
'*.i', '*.c',
225225
'*.sock', '*.control'))
226226
shutil.copytree(os.path.join(vardir, 'statistics'),
227227
os.path.join(artifacts_dir, 'statistics'))

0 commit comments

Comments
 (0)