Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
80a8a9d9
Commit
80a8a9d9
authored
Nov 09, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dyndns: r53 should not throw php errors, rather log to syslog
(cherry picked from commit
65c53e3c
)
parent
a7a0fbf0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
dyndns.class
src/etc/inc/dyndns.class
+2
-1
dyndns.r53.class
src/etc/inc/dyndns.r53.class
+3
-3
No files found.
src/etc/inc/dyndns.class
View file @
80a8a9d9
...
...
@@ -542,7 +542,8 @@
$NewIP
=
$this
->
_dnsIP
;
$NewTTL
=
$this
->
_dnsTTL
;
/* Include Route 53 Library Class */
/* Include Route 53 Library Class (and util.inc for log_error) */
require_once
(
'util.inc'
);
require_once
(
'dyndns.r53.class'
);
/* Set Amazon AWS Credentials for this record */
...
...
src/etc/inc/dyndns.r53.class
View file @
80a8a9d9
...
...
@@ -532,17 +532,17 @@ class Route53
public
function
__triggerError
(
$functionname
,
$error
)
{
if
(
$error
==
false
)
{
trigger_error
(
sprintf
(
"Route53::%s(): Encountered an error, but no description given"
,
$functionname
),
E_USER_WARNING
);
log_error
(
sprintf
(
"Route53::%s(): Encountered an error, but no description given"
,
$functionname
)
);
}
else
if
(
isset
(
$error
[
'curl'
])
&&
$error
[
'curl'
])
{
trigger_error
(
sprintf
(
"Route53::%s(): %s %s"
,
$functionname
,
$error
[
'code'
],
$error
[
'message'
]),
E_USER_WARNING
);
log_error
(
sprintf
(
"Route53::%s(): %s %s"
,
$functionname
,
$error
[
'code'
],
$error
[
'message'
])
);
}
else
if
(
isset
(
$error
[
'Error'
]))
{
$e
=
$error
[
'Error'
];
$message
=
sprintf
(
"Route53::%s(): %s - %s: %s
\n
Request Id: %s
\n
"
,
$functionname
,
$e
[
'Type'
],
$e
[
'Code'
],
$e
[
'Message'
],
$error
[
'RequestId'
]);
trigger_error
(
$message
,
E_USER_WARNING
);
log_error
(
$message
);
}
}
...
...
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