Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(linux.net): DHCP server selection method #5578

Merged
merged 13 commits into from
Nov 25, 2024
Merged

feat(linux.net): DHCP server selection method #5578

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
49417da
Implemented systemd unit exists method
pierantoniomerlino Nov 20, 2024
6c51851
Added folder and tests
pierantoniomerlino Nov 20, 2024
7829dc0
Replaced method for checking unit presence; test updated
pierantoniomerlino Nov 21, 2024
d1a7da1
Applied cleanup
pierantoniomerlino Nov 21, 2024
d36776d
Reverted variable name
pierantoniomerlino Nov 21, 2024
ff50d42
Fixed sonar complains
pierantoniomerlino Nov 21, 2024
64ce410
Improved tool search
pierantoniomerlino Nov 21, 2024
a0d0f30
Changed logger level
pierantoniomerlino Nov 21, 2024
a89a97a
Added log when dnsmasq start fails
pierantoniomerlino Nov 22, 2024
442c927
Fixed minor issues
pierantoniomerlino Nov 22, 2024
1fae8f5
Simplified command process
pierantoniomerlino Nov 22, 2024
a2837bc
Removed useless inner class
pierantoniomerlino Nov 22, 2024
916fa25
Improved logging
pierantoniomerlino Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...ipse.kura.linux.net/src/main/java/org/eclipse/kura/linux/net/dhcp/server/DnsmasqTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ public class DnsmasqTool implements DhcpLinuxTool {
private String globalConfigFilename = "/etc/dnsmasq.d/dnsmasq-globals.conf";
private static final String GLOBAL_CONFIGURATION = "port=0\nbind-dynamic\n";

static final Command IS_ACTIVE_COMMAND = new Command(new String[] { "systemctl", "is-active", "--quiet",
DhcpServerTool.DNSMASQ.getValue() });
static final Command RESTART_COMMAND = new Command(new String[] { "systemctl", "restart",
DhcpServerTool.DNSMASQ.getValue() });
static final Command IS_ACTIVE_COMMAND = new Command(
new String[] { "systemctl", "is-active", "--quiet", DhcpServerTool.DNSMASQ.getValue() });
static final Command RESTART_COMMAND = new Command(
new String[] { "systemctl", "restart", DhcpServerTool.DNSMASQ.getValue() });

private CommandExecutorService executorService;
private Map<String, byte[]> configsLastHash = Collections.synchronizedMap(new HashMap<>());
Expand Down Expand Up @@ -88,6 +88,7 @@ public CommandStatus startInterface(String interfaceName) throws KuraProcessExec
CommandStatus restartStatus = this.executorService.execute(RESTART_COMMAND);

if (!restartStatus.getExitStatus().isSuccessful()) {
logger.error("dnsmasq Systemd unit startup failed. Is dnsmasq package installed on the system?");
marcellorinaldo marked this conversation as resolved.
Show resolved Hide resolved
removeInterfaceConfig(interfaceName);
restartStatus = this.executorService.execute(RESTART_COMMAND);
}
Expand Down