Module: kamailio
Branch: master
Commit: b722a48144ac9e029bdbc2968dedbe56966a3f7c
URL: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2020-05-04T14:48:41+02:00
utils/kamctl: fix dbtestdb
some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c…
related #1747
---
Modified: utils/kamctl/dbtextdb/dbtextdb.py
---
Diff: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5…
Patch: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5…
---
diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py
index 3d5ee7ecc5..7e1de04687 100755
--- a/utils/kamctl/dbtextdb/dbtextdb.py
+++ b/utils/kamctl/dbtextdb/dbtextdb.py
@@ -146,11 +146,11 @@ def _ParseColumns(self):
# check if there is a function modifier on the columns
if self.tokens[0] == 'COUNT':
self.count = True
- if col_end == 1:
- raise ParseError('COUNT must be followed by column name[s]')
- if not self.tokens[1].startswith(self._paren_placeholder):
- raise ParseError('COUNT must be followed by ()')
- cols_str = self._ReplaceParens(self.tokens[1])
+ if col_end == 1:
+ raise ParseError('COUNT must be followed by column name[s]')
+ if not self.tokens[1].startswith(self._paren_placeholder):
+ raise ParseError('COUNT must be followed by ()')
+ cols_str = self._ReplaceParens(self.tokens[1])
cols = cols_str.split(',')
for col in cols:
@@ -300,7 +300,7 @@ def _ParseTargets(self):
if self.tokens.pop(0) != 'SET':
raise ParseError('UPDATE command must be followed by SET')
- self.targets = self._ParsePairs(' '.join(self.tokens), ',')
+ self.targets = self._ParsePairs(' '.join(self.tokens), ',')
# INSERT
if self.command == 'INSERT':
@@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode):
string = '%s%s' % (string, c)
continue # wait for matching delim
- started -= 1
- if not started:
- values.append(string)
- new_args = '%s %s' % (new_args, '%s%d' % (placeholder,
- my_id))
- my_id += 1
- string = ''
+ started -= 1
+ if not started:
+ values.append(string)
+ new_args = '%s %s' % (new_args, '%s%d' % (placeholder,
+ my_id))
+ my_id += 1
+ string = ''
- else:
- if not started:
- new_args = '%s%s' % (new_args, c)
else:
- string = '%s%s' % (string, c)
+ if not started:
+ new_args = '%s%s' % (new_args, c)
+ else:
+ string = '%s%s' % (string, c)
if started:
if mode == 'parens':
@@ -714,8 +714,8 @@ def _RunInsert(self):
elif self.header[col]['auto']:
new_row[col] = self._GetNextAuto(col)
- else:
- raise ExecuteError(col + ' cannot be empty or null')
+ else:
+ raise ExecuteError(col + ' cannot be empty or null')
self.data.append(new_row)
return [1]
Module: kamailio
Branch: 5.3
Commit: 5f6f4331811e654e75b49263f8fb823bea9874a3
URL: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2020-05-04T12:10:05+02:00
utils/kamctl: fix handling of Exceptions
> Traceback (most recent call last):
> File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module>
> main(sys.argv)
> File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main
> except (Error, e):
> NameError: name 'e' is not defined
(cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9)
---
Modified: utils/kamctl/dbtextdb/dbtextdb.py
---
Diff: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823…
Patch: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823…
---
diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py
index 3a35554013..3d5ee7ecc5 100755
--- a/utils/kamctl/dbtextdb/dbtextdb.py
+++ b/utils/kamctl/dbtextdb/dbtextdb.py
@@ -356,7 +356,7 @@ def _EscapeChars(self, value):
# test that the value is string, if not return it as is
try:
value.find('a')
- except:
+ except Exception:
return value
escaped = value
@@ -377,7 +377,7 @@ def _UnEscapeChars(self, value):
# test that the value is string, if not return it as is
try:
value.find('a')
- except:
+ except Exception:
return value
escaped = value
@@ -988,21 +988,19 @@ def _TypeCheck(self, val, col):
if not val and not self.header[col]['null']:
raise ExecuteError(col + ' cannot be empty or null')
- if (self.header[col]['type'].lower() == 'int' or
- self.header[col]['type'].lower() == 'double'):
+ hdr_t = self.header[col]['type'].lower()
+ if hdr_t == 'int' or hdr_t == 'double':
try:
if val:
val = eval(val)
- except (NameError, e):
+ except NameError as e:
raise ExecuteError('Failed to parse %s in %s '
'(unable to convert to type %s): %s' %
- (col, self.table, self.header[col]['type'],
- e))
- except (SyntaxError, e):
+ (col, self.table, hdr_t, e))
+ except SyntaxError as e:
raise ExecuteError('Failed to parse %s in %s '
'(unable to convert to type %s): %s' %
- (col, self.table, self.header[col]['type'],
- e))
+ (col, self.table, hdr_t, e))
return val
@@ -1083,7 +1081,7 @@ def OpenTable(self):
# save a copy of the data before modifying
self.orig_data = self.data[:]
- except (IOError, e):
+ except IOError as e:
raise ExecuteError('Unable to open table %s: %s' % (self.table, e))
Debug('Header is: %s' % self.header)
@@ -1230,7 +1228,7 @@ def main(argv):
print('Updated %s, rows affected: %d' % (conn.table, row))
else:
print(row)
- except (Error, e):
+ except Error as e:
print(e)
sys.exit(1)
Module: kamailio
Branch: master
Commit: 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9
URL: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2020-05-04T11:33:12+02:00
utils/kamctl: fix handling of Exceptions
> Traceback (most recent call last):
> File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module>
> main(sys.argv)
> File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main
> except (Error, e):
> NameError: name 'e' is not defined
---
Modified: utils/kamctl/dbtextdb/dbtextdb.py
---
Diff: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf…
Patch: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf…
---
diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py
index 3a35554013..3d5ee7ecc5 100755
--- a/utils/kamctl/dbtextdb/dbtextdb.py
+++ b/utils/kamctl/dbtextdb/dbtextdb.py
@@ -356,7 +356,7 @@ def _EscapeChars(self, value):
# test that the value is string, if not return it as is
try:
value.find('a')
- except:
+ except Exception:
return value
escaped = value
@@ -377,7 +377,7 @@ def _UnEscapeChars(self, value):
# test that the value is string, if not return it as is
try:
value.find('a')
- except:
+ except Exception:
return value
escaped = value
@@ -988,21 +988,19 @@ def _TypeCheck(self, val, col):
if not val and not self.header[col]['null']:
raise ExecuteError(col + ' cannot be empty or null')
- if (self.header[col]['type'].lower() == 'int' or
- self.header[col]['type'].lower() == 'double'):
+ hdr_t = self.header[col]['type'].lower()
+ if hdr_t == 'int' or hdr_t == 'double':
try:
if val:
val = eval(val)
- except (NameError, e):
+ except NameError as e:
raise ExecuteError('Failed to parse %s in %s '
'(unable to convert to type %s): %s' %
- (col, self.table, self.header[col]['type'],
- e))
- except (SyntaxError, e):
+ (col, self.table, hdr_t, e))
+ except SyntaxError as e:
raise ExecuteError('Failed to parse %s in %s '
'(unable to convert to type %s): %s' %
- (col, self.table, self.header[col]['type'],
- e))
+ (col, self.table, hdr_t, e))
return val
@@ -1083,7 +1081,7 @@ def OpenTable(self):
# save a copy of the data before modifying
self.orig_data = self.data[:]
- except (IOError, e):
+ except IOError as e:
raise ExecuteError('Unable to open table %s: %s' % (self.table, e))
Debug('Header is: %s' % self.header)
@@ -1230,7 +1228,7 @@ def main(argv):
print('Updated %s, rows affected: %d' % (conn.table, row))
else:
print(row)
- except (Error, e):
+ except Error as e:
print(e)
sys.exit(1)
I recently installed kamailio and it was enabled & started--> Service is active & running
But once I added users I see kamailio service is failed
[root@rlab111053 kamailio]# systemctl status kamailio
● kamailio.service - Kamailio (OpenSER) - the Open Source SIP Server
Loaded: loaded (/etc/systemd/system/kamailio.service; enabled; vendor preset: disabled)
Active: failed (Result: start-limit) since Wed 2020-04-29 18:47:26 IST; 860ms ago
Process: 16759 ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY (code=exited, status=255)
Main PID: 16759 (code=exited, status=255)
Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service: main process exited, code=exited, status=255/n/a
Apr 29 18:47:25 rlab111053 systemd[1]: Unit kamailio.service entered failed state.
Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service failed.
Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service holdoff time over, scheduling restart.
Apr 29 18:47:26 rlab111053 systemd[1]: Stopped Kamailio (OpenSER) - the Open Source SIP Server.
Apr 29 18:47:26 rlab111053 systemd[1]: start request repeated too quickly for kamailio.service
Apr 29 18:47:26 rlab111053 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server.
Apr 29 18:47:26 rlab111053 systemd[1]: Unit kamailio.service entered failed state.
Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service failed.
**I am using below version**
[root@rlab111053 kamailio]# kamailio -version
version: kamailio 5.1.10 (x86_64/linux) cfcfd5
flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES
ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB
poll method support: poll, epoll_lt, epoll_et, sigio_rt, select.
id: cfcfd5
compiled on 15:40:49 Mar 6 2020 with gcc 4.8.5
[root@rlab111053 kamailio]#
Can some help to fix it
<!--
Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for bug reports.
If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list:
* http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users
If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list:
* http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue.
If there is no content to be filled in a section, the entire section can be removed.
You can delete the comments from the template sections when filling.
You can delete next line and everything above before submitting (it is a comment).
-->
### Description
<!--
Explain what you did, what you expected to happen, and what actually happened.
-->
### Troubleshooting
#### Reproduction
<!--
If the issue can be reproduced, describe how it can be done.
-->
#### Debugging Data
<!--
If you got a core dump, use gdb to extract troubleshooting data - full backtrace,
local variables and the list of the code at the issue location.
gdb /path/to/kamailio /path/to/corefile
bt full
info locals
list
If you are familiar with gdb, feel free to attach more of what you consider to
be relevant.
-->
```
(paste your debugging data here)
```
#### Log Messages
<!--
Check the syslog file and if there are relevant log messages printed by Kamailio, add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
(paste your log messages here)
```
#### SIP Traffic
<!--
If the issue is exposed by processing specific SIP messages, grab them with ngrep or save in a pcap file, then add them next, or attach to issue, or provide a link to download them (e.g., to a pastebin site).
-->
```
(paste your sip traffic here)
```
### Possible Solutions
<!--
If you found a solution or workaround for the issue, describe it. Ideally, provide a pull request with a fix.
-->
### Additional Information
* **Kamailio Version** - output of `kamailio -v`
```
(paste your output here)
```
* **Operating System**:
<!--
Details about the operating system, the type: Linux (e.g.,: Debian 8.4, Ubuntu 16.04, CentOS 7.1, ...), MacOS, xBSD, Solaris, ...;
Kernel details (output of `uname -a`)
-->
```
(paste your output here)
```
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/2309