Skip to content

Commit 0274247

Browse files
vanitha1822DurgaPrasad-54snehar-nd
authored
Merge release 3.6.1 to main (#130)
* Cherry-pick health and version API enhancements to release-3.6.1 (#126) * feat(health,version): add health and version endpoints without auth * fix(health,version): remove unused git properties * refactor(health): simplify MySQL health check and remove sensitive details * fix(health): fix healthservices timeout issue * fix(health): include sanitized error in DOWN responses * fix(health): harden advanced MySQL checks and throttle execution * fix(health): scope PROCESSLIST lock-wait check to application DB user * fix(health): cancel timed-out advanced MySQL checks to avoid orphaned tasks * fix(health): avoid blocking DB I/O under write lock and restore interrupt flag * feat(health): add gpl license header * fix: update the version * fix: resolve conflicts --------- Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com>
1 parent b643b6b commit 0274247

3 files changed

Lines changed: 45 additions & 1 deletion

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212
<groupId>com.iemr.ecd</groupId>
1313
<artifactId>ecd-api</artifactId>
14-
<version>3.6.0</version>
14+
<version>3.6.1</version>
1515
<packaging>war</packaging>
1616
<name>ECD-API</name>
1717
<description>ECD project</description>

src/main/java/com/iemr/ecd/controller/health/HealthController.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/*
2+
* AMRIT – Accessible Medical Records via Integrated Technology
3+
* Integrated EHR (Electronic Health Records) Solution
4+
*
5+
* Copyright (C) "Piramal Swasthya Management and Research Institute"
6+
*
7+
* This file is part of AMRIT.
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU General Public License as published by
11+
* the Free Software Foundation, either version 3 of the License, or
12+
* (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU General Public License
20+
* along with this program. If not, see https://www.gnu.org/licenses/.
21+
*/
22+
123
package com.iemr.ecd.controller.health;
224

325
import java.time.Instant;

src/main/java/com/iemr/ecd/service/health/HealthService.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/*
2+
* AMRIT – Accessible Medical Records via Integrated Technology
3+
* Integrated EHR (Electronic Health Records) Solution
4+
*
5+
* Copyright (C) "Piramal Swasthya Management and Research Institute"
6+
*
7+
* This file is part of AMRIT.
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU General Public License as published by
11+
* the Free Software Foundation, either version 3 of the License, or
12+
* (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU General Public License
20+
* along with this program. If not, see https://www.gnu.org/licenses/.
21+
*/
22+
123
package com.iemr.ecd.service.health;
224

325
import java.sql.Connection;

0 commit comments

Comments
 (0)