Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Imldeployment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IML Open Source
Imldeployment
Commits
72d35e70
Commit
72d35e70
authored
6 years ago
by
hahn
Browse files
Options
Downloads
Patches
Plain Diff
update appmonitor client; add load and apache status
parent
40ecaa3c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
public_html/appmonitor/classes/appmonitor-checks.class.php
+9
-1
9 additions, 1 deletion
public_html/appmonitor/classes/appmonitor-checks.class.php
public_html/appmonitor/classes/appmonitor-client.class.php
+2
-2
2 additions, 2 deletions
public_html/appmonitor/classes/appmonitor-client.class.php
with
11 additions
and
3 deletions
public_html/appmonitor/classes/appmonitor-checks.class.php
+
9
−
1
View file @
72d35e70
...
@@ -49,7 +49,7 @@ if(!defined('RESULT_OK')){
...
@@ -49,7 +49,7 @@ if(!defined('RESULT_OK')){
* 2019-05-31 0.87 axel.hahn@iml.unibe.ch add timeout as param in connective checks (http, tcp, databases)<br>
* 2019-05-31 0.87 axel.hahn@iml.unibe.ch add timeout as param in connective checks (http, tcp, databases)<br>
* 2019-06-05 0.88 axel.hahn@iml.unibe.ch add plugins<br>
* 2019-06-05 0.88 axel.hahn@iml.unibe.ch add plugins<br>
* --------------------------------------------------------------------------------<br>
* --------------------------------------------------------------------------------<br>
* @version 0.
8
9
* @version 0.9
1
* @author Axel Hahn
* @author Axel Hahn
* @link TODO
* @link TODO
* @license GPL
* @license GPL
...
@@ -906,10 +906,18 @@ class appmonitorcheck {
...
@@ -906,10 +906,18 @@ class appmonitorcheck {
$this
->
_setReturn
(
RESULT_ERROR
,
"ERROR: Sqlite database file "
.
$aParams
[
"db"
]
.
" does not exist."
);
$this
->
_setReturn
(
RESULT_ERROR
,
"ERROR: Sqlite database file "
.
$aParams
[
"db"
]
.
" does not exist."
);
return
false
;
return
false
;
}
}
if
(
!
isset
(
$aParams
[
'user'
])){
$aParams
[
'user'
]
=
''
;
}
if
(
!
isset
(
$aParams
[
'password'
])){
$aParams
[
'password'
]
=
''
;
}
try
{
try
{
// $db = new SQLite3($sqliteDB);
// $db = new SQLite3($sqliteDB);
// $db = new PDO("sqlite:".$sqliteDB);
// $db = new PDO("sqlite:".$sqliteDB);
$o
=
new
PDO
(
"sqlite:"
.
$aParams
[
"db"
],
$o
=
new
PDO
(
"sqlite:"
.
$aParams
[
"db"
],
$aParams
[
'user'
],
$aParams
[
'password'
],
array
(
array
(
PDO
::
ATTR_TIMEOUT
=>
(
isset
(
$aParams
[
"timeout"
])
&&
(
int
)
$aParams
[
"timeout"
])
?
(
int
)
$aParams
[
"timeout"
]
:
$this
->
_iTimeoutTcp
,
PDO
::
ATTR_TIMEOUT
=>
(
isset
(
$aParams
[
"timeout"
])
&&
(
int
)
$aParams
[
"timeout"
])
?
(
int
)
$aParams
[
"timeout"
]
:
$this
->
_iTimeoutTcp
,
)
)
...
...
This diff is collapsed.
Click to expand it.
public_html/appmonitor/classes/appmonitor-client.class.php
+
2
−
2
View file @
72d35e70
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
* 2018-11-05 0.58 axel.hahn@iml.unibe.ch additional flag in http check to show content<br>
* 2018-11-05 0.58 axel.hahn@iml.unibe.ch additional flag in http check to show content<br>
* 2019-05-31 0.87 axel.hahn@iml.unibe.ch add timeout as param in connective checks (http, tcp, databases)<br>
* 2019-05-31 0.87 axel.hahn@iml.unibe.ch add timeout as param in connective checks (http, tcp, databases)<br>
* --------------------------------------------------------------------------------<br>
* --------------------------------------------------------------------------------<br>
* @version 0.
88
* @version 0.
91
* @author Axel Hahn
* @author Axel Hahn
* @link TODO
* @link TODO
* @license GPL
* @license GPL
...
@@ -51,7 +51,7 @@ class appmonitor {
...
@@ -51,7 +51,7 @@ class appmonitor {
* value is in seconds
* value is in seconds
* @var int
* @var int
*/
*/
protected
$_sVersion
=
'php-client-v0.
8
9'
;
protected
$_sVersion
=
'php-client-v0.9
1
'
;
/**
/**
* config: default ttl for server before requesting the client check again
* config: default ttl for server before requesting the client check again
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment