Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
smradius
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smradius
smradius
Commits
da8d8603
Commit
da8d8603
authored
Sep 22, 2016
by
Nigel Kukard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUGFIX: Fixed issue with AWIT::DB::DBLayer::error/Error
parent
3efb5991
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
41 deletions
+39
-41
lib/smradius/modules/accounting/mod_accounting_sql.pm
lib/smradius/modules/accounting/mod_accounting_sql.pm
+10
-10
lib/smradius/modules/features/mod_feature_update_user_stats_sql.pm
...ius/modules/features/mod_feature_update_user_stats_sql.pm
+1
-1
lib/smradius/modules/system/mod_config_sql.pm
lib/smradius/modules/system/mod_config_sql.pm
+6
-6
lib/smradius/modules/system/mod_config_sql_topups.pm
lib/smradius/modules/system/mod_config_sql_topups.pm
+15
-17
lib/smradius/modules/userdb/mod_userdb_macauth_sql.pm
lib/smradius/modules/userdb/mod_userdb_macauth_sql.pm
+1
-1
lib/smradius/modules/userdb/mod_userdb_sql.pm
lib/smradius/modules/userdb/mod_userdb_sql.pm
+6
-6
No files found.
lib/smradius/modules/accounting/mod_accounting_sql.pm
View file @
da8d8603
...
...
@@ -355,7 +355,7 @@ sub getUsage
# Fetch data
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
@@ -463,7 +463,7 @@ sub acct_log
# Fetch previous records of the same session
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
@@ -555,7 +555,7 @@ sub acct_log
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Failed to update accounting ALIVE record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
...
...
@@ -584,7 +584,7 @@ sub acct_log
my
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Failed to insert accounting START record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Update first login?
...
...
@@ -611,7 +611,7 @@ sub acct_log
# Update database (status)
my
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Failed to update accounting STOP record: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Failed to update accounting STOP record: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
}
...
...
@@ -633,7 +633,7 @@ sub fixDuplicates
# Select duplicates
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
@@ -656,7 +656,7 @@ sub fixDuplicates
# Delete duplicates
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Database query failed: %s
",
AWITPT::DB::DBLayer::
e
rror
());
DBRollback
();
return
;
}
...
...
@@ -704,7 +704,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Cleanup => Failed to delete accounting summary record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
DBRollback
();
return
;
}
...
...
@@ -729,7 +729,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Cleanup => Failed to select accounting record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
@@ -836,7 +836,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_ACCOUNTING_SQL] Cleanup => Failed to create accounting summary record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
DBRollback
();
return
;
}
...
...
lib/smradius/modules/features/mod_feature_update_user_stats_sql.pm
View file @
da8d8603
...
...
@@ -155,7 +155,7 @@ sub updateUserStats
# Perform query
my
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_FEATURE_UPDATE_USER_STATS_SQL] Database query failed:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_FEATURE_UPDATE_USER_STATS_SQL] Database query failed:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
lib/smradius/modules/system/mod_config_sql.pm
View file @
da8d8603
...
...
@@ -171,7 +171,7 @@ sub getConfig
$server
->
log
(
LOG_DEBUG
,"
Processing DEFAULT realm attributes
");
my
$sth
=
DBSelect
(
$config
->
{'
get_config_realm_id_query
'},
$realmName
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get default realm ID:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get default realm ID:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Set realm ID
...
...
@@ -186,7 +186,7 @@ sub getConfig
if
(
defined
(
$realmID
))
{
$sth
=
DBSelect
(
$config
->
{'
get_config_realm_attributes_query
'},
$realmID
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get default realm config attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get default realm config attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Add any default realm attributes to config attributes
...
...
@@ -204,7 +204,7 @@ sub getConfig
$sth
=
DBSelect
(
$config
->
{'
get_config_realm_id_query
'},
$realmName
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get realm config attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get realm config attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Fetch realm ID
...
...
@@ -216,7 +216,7 @@ sub getConfig
# User realm attributes
$sth
=
DBSelect
(
$config
->
{'
get_config_realm_attributes_query
'},
$realmID
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get realm config attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get realm config attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Add any realm attributes to config attributes
...
...
@@ -260,7 +260,7 @@ sub getConfig
$sth
=
DBSelect
(
$config
->
{'
get_config_accesslist_query
'},
$realmID
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get config attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get config attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
...
...
@@ -301,7 +301,7 @@ sub getConfig
if
(
defined
(
$clientID
))
{
my
$sth
=
DBSelect
(
$config
->
{'
get_config_client_attributes_query
'},
$clientID
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get default config attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get default config attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Add to config attributes
...
...
lib/smradius/modules/system/mod_config_sql_topups.pm
View file @
da8d8603
...
...
@@ -217,7 +217,7 @@ sub getTopups
# Query database
my
$sth
=
DBSelect
(
$config
->
{'
get_topups_summary_query
'},
$periodKey
,
$username
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get topup information: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get topup information: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
while
(
my
$row
=
hashifyLCtoMC
(
$sth
->
fetchrow_hashref
(),
qw(Balance Type ID)
))
{
...
...
@@ -228,7 +228,7 @@ sub getTopups
# Query database
$sth
=
DBSelect
(
$config
->
{'
get_topups_query
'},
$thisMonth
->
ymd
,
$now
->
ymd
,
$username
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get topup information: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get topup information: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
# Fetch all new topups
...
...
@@ -286,7 +286,7 @@ sub cleanup
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select users:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
return
;
}
...
...
@@ -315,7 +315,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to delete topup summaries:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
DBRollback
();
return
;
}
...
...
@@ -331,8 +331,7 @@ sub cleanup
SMAdminDepletedOn >= ?
',
$thisMonth
->
ymd
()
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to undeplete topups:
"
.
AWITPT::DB::DBLayer::
Error
());
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to undeplete topups:
"
.
AWITPT::DB::DBLayer::
error
());
DBRollback
();
return
;
}
...
...
@@ -351,7 +350,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to retrieve accounting summaries:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
DBRollback
();
return
;
}
...
...
@@ -378,7 +377,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select accounting summary record:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -428,7 +427,7 @@ sub cleanup
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select group usage caps:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -483,7 +482,7 @@ sub cleanup
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select user usage caps:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -552,7 +551,7 @@ sub cleanup
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select topup summaries:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -622,8 +621,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select topups:
"
.
AWITPT::DB::DBLayer::
Error
());
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to select topups:
"
.
AWITPT::DB::DBLayer::
error
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -1015,7 +1013,7 @@ sub cleanup
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to create topup summary:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -1042,7 +1040,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to deplete topup:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -1068,7 +1066,7 @@ sub cleanup
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Cleanup => Failed to update topups_summary:
"
.
AWITPT::DB::DBLayer::
E
rror
());
AWITPT::DB::DBLayer::
e
rror
());
goto
FAIL_ROLLBACK
;
}
...
...
@@ -1124,7 +1122,7 @@ sub addTopup
# Insert into database
my
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Failed to insert topup record: %s
",
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_CONFIG_SQL_TOPUPS] Failed to insert topup record: %s
",
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_NACK
;
}
...
...
lib/smradius/modules/userdb/mod_userdb_macauth_sql.pm
View file @
da8d8603
...
...
@@ -139,7 +139,7 @@ sub find
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_USERDB_MACAUTH_SQL] Failed to find data for MAC address:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_USERDB_MACAUTH_SQL] Failed to find data for MAC address:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_SKIP
;
}
...
...
lib/smradius/modules/userdb/mod_userdb_sql.pm
View file @
da8d8603
...
...
@@ -273,7 +273,7 @@ sub find
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
[MOD_USERDB_SQL] Failed to find user data:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
[MOD_USERDB_SQL] Failed to find user data:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
MOD_RES_SKIP
;
}
...
...
@@ -338,7 +338,7 @@ sub get
# Query database
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get group attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get group attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
RES_ERROR
;
}
...
...
@@ -356,7 +356,7 @@ sub get
# Query database
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get user attributes:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get user attributes:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
RES_ERROR
;
}
...
...
@@ -409,7 +409,7 @@ sub data_set
# Query database
my
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to update users data:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to update users data:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
RES_ERROR
;
}
...
...
@@ -420,7 +420,7 @@ sub data_set
# Insert
$sth
=
DBDo
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to set users data:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to set users data:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
RES_ERROR
;
}
}
...
...
@@ -494,7 +494,7 @@ sub data_get
# Query database
my
$sth
=
DBSelect
(
@dbDoParams
);
if
(
!
$sth
)
{
$server
->
log
(
LOG_ERR
,"
Failed to get users data:
"
.
AWITPT::DB::DBLayer::
E
rror
());
$server
->
log
(
LOG_ERR
,"
Failed to get users data:
"
.
AWITPT::DB::DBLayer::
e
rror
());
return
RES_ERROR
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment