Skip to content

Commit 5722e26

Browse files
berrangeberrange
committed
util: drop logging filter/output flags
With the removal of support for log message stack traces, there is nothing using the logging filter/output flags and they can be removed. Reviewed-by: Ján Tomko <[email protected]> Signed-off-by: Daniel P. Berrangé <[email protected]>
1 parent 9b80e0c commit 5722e26

File tree

3 files changed

+9
-41
lines changed

3 files changed

+9
-41
lines changed

‎src/util/virlog.c

+8-29
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ VIR_ENUM_IMPL(virLogDestination,
8787
struct _virLogFilter {
8888
char *match;
8989
virLogPriority priority;
90-
unsigned int flags; /* bitwise OR of virLogFilterFlags */
9190
};
9291

9392
static int virLogFiltersSerial = 1;
@@ -126,7 +125,6 @@ static void virLogOutputToFd(virLogSourcePtr src,
126125
const char *funcname,
127126
const char *timestamp,
128127
virLogMetadataPtr metadata,
129-
unsigned int flags,
130128
const char *rawstr,
131129
const char *str,
132130
void *data);
@@ -509,19 +507,16 @@ virLogSourceUpdate(virLogSourcePtr source)
509507
virLogLock();
510508
if (source->serial < virLogFiltersSerial) {
511509
unsigned int priority = virLogDefaultPriority;
512-
unsigned int flags = 0;
513510
size_t i;
514511

515512
for (i = 0; i < virLogNbFilters; i++) {
516513
if (fnmatch(virLogFilters[i]->match, source->name, 0) == 0) {
517514
priority = virLogFilters[i]->priority;
518-
flags = virLogFilters[i]->flags;
519515
break;
520516
}
521517
}
522518

523519
source->priority = priority;
524-
source->flags = flags;
525520
source->serial = virLogFiltersSerial;
526521
}
527522
virLogUnlock();
@@ -590,7 +585,6 @@ virLogVMessage(virLogSourcePtr source,
590585
int ret;
591586
size_t i;
592587
int saved_errno = errno;
593-
unsigned int filterflags = 0;
594588

595589
if (virLogInitialize() < 0)
596590
return;
@@ -610,7 +604,6 @@ virLogVMessage(virLogSourcePtr source,
610604
virLogSourceUpdate(source);
611605
if (priority < source->priority)
612606
goto cleanup;
613-
filterflags = source->flags;
614607

615608
/*
616609
* serialize the error message, add level and timestamp
@@ -640,21 +633,21 @@ virLogVMessage(virLogSourcePtr source,
640633
if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
641634
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
642635
__FILE__, __LINE__, __func__,
643-
timestamp, NULL, 0, rawinitmsg, initmsg,
636+
timestamp, NULL, rawinitmsg, initmsg,
644637
virLogOutputs[i]->data);
645638
VIR_FREE(initmsg);
646639
if (virLogHostnameString(&hoststr, &initmsg) >= 0)
647640
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
648641
__FILE__, __LINE__, __func__,
649-
timestamp, NULL, 0, hoststr, initmsg,
642+
timestamp, NULL, hoststr, initmsg,
650643
virLogOutputs[i]->data);
651644
VIR_FREE(hoststr);
652645
VIR_FREE(initmsg);
653646
virLogOutputs[i]->logInitMessage = false;
654647
}
655648
virLogOutputs[i]->f(source, priority,
656649
filename, linenr, funcname,
657-
timestamp, metadata, filterflags,
650+
timestamp, metadata,
658651
str, msg, virLogOutputs[i]->data);
659652
}
660653
}
@@ -666,21 +659,21 @@ virLogVMessage(virLogSourcePtr source,
666659
if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
667660
virLogOutputToFd(&virLogSelf, VIR_LOG_INFO,
668661
__FILE__, __LINE__, __func__,
669-
timestamp, NULL, 0, rawinitmsg, initmsg,
662+
timestamp, NULL, rawinitmsg, initmsg,
670663
(void *) STDERR_FILENO);
671664
VIR_FREE(initmsg);
672665
if (virLogHostnameString(&hoststr, &initmsg) >= 0)
673666
virLogOutputToFd(&virLogSelf, VIR_LOG_INFO,
674667
__FILE__, __LINE__, __func__,
675-
timestamp, NULL, 0, hoststr, initmsg,
668+
timestamp, NULL, hoststr, initmsg,
676669
(void *) STDERR_FILENO);
677670
VIR_FREE(hoststr);
678671
VIR_FREE(initmsg);
679672
logInitMessageStderr = false;
680673
}
681674
virLogOutputToFd(source, priority,
682675
filename, linenr, funcname,
683-
timestamp, metadata, filterflags,
676+
timestamp, metadata,
684677
str, msg, (void *) STDERR_FILENO);
685678
}
686679
virLogUnlock();
@@ -700,16 +693,13 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED,
700693
const char *funcname G_GNUC_UNUSED,
701694
const char *timestamp,
702695
virLogMetadataPtr metadata G_GNUC_UNUSED,
703-
unsigned int flags,
704696
const char *rawstr G_GNUC_UNUSED,
705697
const char *str,
706698
void *data)
707699
{
708700
int fd = (intptr_t) data;
709701
char *msg;
710702

711-
virCheckFlags(0,);
712-
713703
if (fd < 0)
714704
return;
715705

@@ -805,13 +795,10 @@ virLogOutputToSyslog(virLogSourcePtr source G_GNUC_UNUSED,
805795
const char *funcname G_GNUC_UNUSED,
806796
const char *timestamp G_GNUC_UNUSED,
807797
virLogMetadataPtr metadata G_GNUC_UNUSED,
808-
unsigned int flags,
809798
const char *rawstr G_GNUC_UNUSED,
810799
const char *str,
811800
void *data G_GNUC_UNUSED)
812801
{
813-
virCheckFlags(0,);
814-
815802
syslog(virLogPrioritySyslog(priority), "%s", str);
816803
}
817804

@@ -953,12 +940,10 @@ virLogOutputToJournald(virLogSourcePtr source,
953940
const char *funcname,
954941
const char *timestamp G_GNUC_UNUSED,
955942
virLogMetadataPtr metadata,
956-
unsigned int flags,
957943
const char *rawstr,
958944
const char *str G_GNUC_UNUSED,
959945
void *data)
960946
{
961-
virCheckFlags(0,);
962947
int buffd = -1;
963948
int journalfd = (intptr_t) data;
964949
struct msghdr mh;
@@ -1371,7 +1356,6 @@ virLogOutputNew(virLogOutputFunc f,
13711356
* virLogFilterNew:
13721357
* @match: the pattern to match
13731358
* @priority: the priority to give to messages matching the pattern
1374-
* @flags: extra flags, see virLogFilterFlags enum
13751359
*
13761360
* Allocates and returns a new log filter object. The object has to be later
13771361
* defined, so that the pattern will be taken into account when executing the
@@ -1385,15 +1369,12 @@ virLogOutputNew(virLogOutputFunc f,
13851369
*/
13861370
virLogFilterPtr
13871371
virLogFilterNew(const char *match,
1388-
virLogPriority priority,
1389-
unsigned int flags)
1372+
virLogPriority priority)
13901373
{
13911374
virLogFilterPtr ret = NULL;
13921375
char *mdup = NULL;
13931376
size_t mlen = strlen(match);
13941377

1395-
virCheckFlags(0, NULL);
1396-
13971378
if (priority < VIR_LOG_DEBUG || priority > VIR_LOG_ERROR) {
13981379
virReportError(VIR_ERR_INVALID_ARG, _("Invalid log priority %d"),
13991380
priority);
@@ -1417,7 +1398,6 @@ virLogFilterNew(const char *match,
14171398

14181399
ret->match = mdup;
14191400
ret->priority = priority;
1420-
ret->flags = flags;
14211401

14221402
return ret;
14231403
}
@@ -1662,7 +1642,6 @@ virLogParseFilter(const char *src)
16621642
size_t count = 0;
16631643
virLogPriority prio;
16641644
char **tokens = NULL;
1665-
unsigned int flags = 0;
16661645
char *match = NULL;
16671646

16681647
VIR_DEBUG("filter=%s", src);
@@ -1698,7 +1677,7 @@ virLogParseFilter(const char *src)
16981677
goto cleanup;
16991678
}
17001679

1701-
if (!(ret = virLogFilterNew(match, prio, flags)))
1680+
if (!(ret = virLogFilterNew(match, prio)))
17021681
goto cleanup;
17031682

17041683
cleanup:

‎src/util/virlog.h

+1-10
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ struct _virLogSource {
6464
const char *name;
6565
unsigned int priority;
6666
unsigned int serial;
67-
unsigned int flags;
6867
};
6968

7069
/*
@@ -77,7 +76,6 @@ struct _virLogSource {
7776
.name = "" n "", \
7877
.priority = VIR_LOG_ERROR, \
7978
.serial = 0, \
80-
.flags = 0, \
8179
}
8280

8381
/*
@@ -144,7 +142,6 @@ typedef virLogFilter *virLogFilterPtr;
144142
* @funcname: the function emitting the message
145143
* @timestamp: zero terminated string with timestamp of the message
146144
* @metadata: NULL or metadata array, terminated by an item with NULL key
147-
* @flags: flags associated with the message
148145
* @rawstr: the unformatted message to log, zero terminated
149146
* @str: the message to log, preformatted and zero terminated
150147
* @data: extra output logging data
@@ -158,7 +155,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src,
158155
const char *funcname,
159156
const char *timestamp,
160157
virLogMetadataPtr metadata,
161-
unsigned int flags,
162158
const char *rawstr,
163159
const char *str,
164160
void *data);
@@ -171,10 +167,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src,
171167
*/
172168
typedef void (*virLogCloseFunc) (void *data);
173169

174-
typedef enum {
175-
VIR_LOG_STACK_TRACE = (1 << 0),
176-
} virLogFilterFlags;
177-
178170
int virLogGetNbFilters(void);
179171
int virLogGetNbOutputs(void);
180172
char *virLogGetFilters(void);
@@ -224,8 +216,7 @@ virLogOutputPtr virLogOutputNew(virLogOutputFunc f,
224216
virLogDestination dest,
225217
const char *name) ATTRIBUTE_NONNULL(1);
226218
virLogFilterPtr virLogFilterNew(const char *match,
227-
virLogPriority priority,
228-
unsigned int flags) ATTRIBUTE_NONNULL(1);
219+
virLogPriority priority) ATTRIBUTE_NONNULL(1);
229220
int virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs,
230221
virLogDestination dest, const void *opaque);
231222
int virLogDefineOutputs(virLogOutputPtr *outputs,

‎tests/testutils.c

-2
Original file line numberDiff line numberDiff line change
@@ -740,13 +740,11 @@ virtTestLogOutput(virLogSourcePtr source G_GNUC_UNUSED,
740740
const char *funcname G_GNUC_UNUSED,
741741
const char *timestamp,
742742
virLogMetadataPtr metadata G_GNUC_UNUSED,
743-
unsigned int flags,
744743
const char *rawstr G_GNUC_UNUSED,
745744
const char *str,
746745
void *data)
747746
{
748747
struct virtTestLogData *log = data;
749-
virCheckFlags(0,);
750748
virBufferAsprintf(&log->buf, "%s: %s", timestamp, str);
751749
}
752750

0 commit comments

Comments
 (0)