SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23821 from dtardon/ascii-logging

Browse Source 
Allow ASCII fallback for Unicode characters in logs
This commit is contained in:
Yu Watanabe
2022-06-29 03:36:35 +09:00
committed by GitHub
parent 94f881fd8e 28e5e1e97f
commit d5548eb618
40 changed files with 193 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+10 -5
View File
@@ -26,6 +26,7 @@
#include "fileio.h"
#include "format-util.h"
#include "fs-util.h"
#include "glyph-util.h"
#include "ipvlan.h"
#include "missing_network.h"
#include "netlink-util.h"
@@ -2036,7 +2037,8 @@ static int link_update_master(Link *link, sd_netlink_message *message) {
else if (master_ifindex == 0)
log_link_debug(link, "Detached from master interface: %i", link->master_ifindex);
else
log_link_debug(link, "Master interface changed: %i → %i", link->master_ifindex, master_ifindex);
log_link_debug(link, "Master interface changed: %i %s %i", link->master_ifindex,
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), master_ifindex);
link_drop_from_master(link);
@@ -2151,8 +2153,10 @@ static int link_update_hardware_address(Link *link, sd_netlink_message *message)
if (link->hw_addr.length == 0)
log_link_debug(link, "Saved hardware address: %s", HW_ADDR_TO_STR(&addr));
else {
log_link_debug(link, "Hardware address is changed: %s → %s",
HW_ADDR_TO_STR(&link->hw_addr), HW_ADDR_TO_STR(&addr));
log_link_debug(link, "Hardware address is changed: %s %s %s",
HW_ADDR_TO_STR(&link->hw_addr),
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT),
HW_ADDR_TO_STR(&addr));
hashmap_remove_value(link->manager->links_by_hw_addr, &link->hw_addr, link);
}
@@ -2248,8 +2252,9 @@ static int link_update_mtu(Link *link, sd_netlink_message *message) {
return 0;
if (link->mtu != 0)
log_link_debug(link, "MTU is changed: %"PRIu32" → %"PRIu32" (min: %"PRIu32", max: %"PRIu32")",
link->mtu, mtu, link->min_mtu, link->max_mtu);
log_link_debug(link, "MTU is changed: %"PRIu32" %s %"PRIu32" (min: %"PRIu32", max: %"PRIu32")",
link->mtu, special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), mtu,
link->min_mtu, link->max_mtu);
link->mtu = mtu;