Skip to content

Commit bbe4d43

Browse files
malytomasmalytomas
committed
logging without '
1 parent eb2140e commit bbe4d43

File tree

21 files changed

+119
-119
lines changed

21 files changed

+119
-119
lines changed

‎sources/asset-analyze/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace
3030

3131
AssetsLists analyzeFile(const String &path)
3232
{
33-
CAGE_LOG(SeverityEnum::Info, "analyze", String() + "analyzing file '" + path + "'");
33+
CAGE_LOG(SeverityEnum::Info, "analyze", String() + "analyzing file: " + path);
3434
try
3535
{
3636
Holder<Process> prg = newProcess(String() + "cage-asset-processor analyze " + path);
@@ -45,7 +45,7 @@ namespace
4545
detail::OverrideBreakpoint ob;
4646
line = prg->readLine();
4747
}
48-
CAGE_LOG_DEBUG(SeverityEnum::Info, "process", Stringizer() + "message '" + line + "'");
48+
CAGE_LOG_DEBUG(SeverityEnum::Info, "process", Stringizer() + "message: " + line);
4949
if (line == "cage-stop")
5050
break;
5151
else if (line == "cage-begin")
@@ -80,14 +80,14 @@ namespace
8080
}
8181
catch (...)
8282
{
83-
CAGE_LOG(SeverityEnum::Warning, "analyze", String() + "an error occurred while analyzing file '" + path + "'");
83+
CAGE_LOG(SeverityEnum::Warning, "analyze", String() + "an error occurred while analyzing file: " + path);
8484
}
8585
return {};
8686
}
8787

8888
void analyzeFolder(const String &path)
8989
{
90-
CAGE_LOG(SeverityEnum::Info, "analyze", String() + "analyzing directory '" + path + "'");
90+
CAGE_LOG(SeverityEnum::Info, "analyze", String() + "analyzing directory: " + path);
9191

9292
std::set<String> files, directories;
9393
const auto list = pathListDirectory(path);

‎sources/asset-database/databank.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bool databankParse(const String &databank)
8686
}
8787
catch (cage::Exception &)
8888
{
89-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "invalid databank ini file '" + databank + "'");
89+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "invalid databank ini file: " + databank);
9090
return false;
9191
}
9292

@@ -98,13 +98,13 @@ bool databankParse(const String &databank)
9898
const String scheme = ini->getString(section, "scheme");
9999
if (scheme.empty())
100100
{
101-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "undefined scheme in databank '" + databank + "' in section '" + section + "'");
101+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "undefined scheme in databank: " + databank + ", in section: " + section);
102102
errors++;
103103
continue;
104104
}
105105
if (schemes.count(scheme) == 0)
106106
{
107-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "invalid scheme '" + scheme + "' in databank '" + databank + "' in section '" + section + "'");
107+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "invalid scheme: " + scheme + ", in databank: " + databank + ", in section: " + section);
108108
errors++;
109109
continue;
110110
}
@@ -135,7 +135,7 @@ bool databankParse(const String &databank)
135135
if (assets.count(ass->name) > 0)
136136
{
137137
const auto &ass2 = assets[ass->name];
138-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "duplicate asset name '" + ass->name + "' in databank '" + databank + "' in section '" + section + "' with asset in databank '" + ass2->databank + "'");
138+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "duplicate asset name: " + ass->name + ", in databank: " + databank + ", in section: " + section + ", with asset in databank: " + ass2->databank);
139139
errors++;
140140
continue;
141141
}
@@ -158,7 +158,7 @@ bool databankParse(const String &databank)
158158
String s, t, v;
159159
if (ini->anyUnused(s, t, v))
160160
{
161-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "unused property/asset '" + t + "' = '" + v + "' in databank '" + databank + "' in section '" + s + "'");
161+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "unused property/asset: " + t + " = " + v + ", in databank: " + databank + ", in section: " + s);
162162
errors++;
163163
}
164164
}
@@ -198,7 +198,7 @@ void databanksLoad()
198198
return;
199199
}
200200

201-
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "loading database cache: '" + (String)configPathDatabase + "'");
201+
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "loading database cache: " + (String)configPathDatabase);
202202
if (!pathIsFile(configPathDatabase))
203203
{
204204
CAGE_LOG(SeverityEnum::Info, "database", "database cache does not exist, starting from scratch");
@@ -238,7 +238,7 @@ void databanksSave()
238238
// save database
239239
if (!((String)configPathDatabase).empty())
240240
{
241-
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "saving database cache: '" + (String)configPathDatabase + "'");
241+
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "saving database cache: " + (String)configPathDatabase);
242242
MemoryBuffer buf;
243243
Serializer ser(buf);
244244
ser << databaseBegin;
@@ -323,7 +323,7 @@ namespace
323323
void findFiles(std::map<String, PathLastChange, StringComparatorFast> &files, const String &path)
324324
{
325325
const String pth = pathJoin(configPathInput, path);
326-
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "checking path '" + pth + "'");
326+
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "checking path: " + pth);
327327
const auto list = pathListDirectory(pth);
328328
for (const String &p : list)
329329
{

‎sources/asset-database/processing.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ namespace
8888
{
8989
if (pathIsAbs(line))
9090
{
91-
CAGE_LOG_THROW(Stringizer() + "path: '" + line + "'");
91+
CAGE_LOG_THROW(Stringizer() + "path: " + line);
9292
CAGE_THROW_ERROR(Exception, "assets use path must be relative");
9393
}
9494
if (!pathIsFile(pathJoin(pathToAbs(configPathInput), line)))
9595
{
96-
CAGE_LOG_THROW(Stringizer() + "path: '" + line + "'");
96+
CAGE_LOG_THROW(Stringizer() + "path: " + line);
9797
CAGE_THROW_ERROR(Exception, "assets use path does not exist");
9898
}
9999
ass.files.insert(line);
@@ -102,7 +102,7 @@ namespace
102102
ass.references.insert(line);
103103
else
104104
{
105-
CAGE_LOG_THROW(Stringizer() + "parameter: '" + param + "', value: '" + line + "'");
105+
CAGE_LOG_THROW(Stringizer() + "parameter: " + param + ", value: " + line);
106106
CAGE_THROW_ERROR(Exception, "unknown parameter name");
107107
}
108108
}
@@ -122,12 +122,12 @@ namespace
122122
}
123123
catch (const Exception &e)
124124
{
125-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "processing asset '" + ass.name + "' failed");
125+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "failed processing asset: " + ass.name);
126126
}
127127
catch (...)
128128
{
129129
detail::logCurrentCaughtException();
130-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "unknown exception while processing asset '" + ass.name + "'");
130+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "unknown exception while processing asset: " + ass.name);
131131
}
132132
}
133133

@@ -162,8 +162,8 @@ namespace
162162
}
163163

164164
// find new or modified databanks
165-
const auto corruptedDbsCopy = std::move(corruptedDatabanks);
166-
CAGE_ASSERT(corruptedDatabanks.empty());
165+
std::set<String, StringComparatorFast> corruptedDbsCopy;
166+
std::swap(corruptedDbsCopy, corruptedDatabanks);
167167
for (const auto &f : files)
168168
{
169169
if (!isNameDatabank(f.first))
@@ -192,7 +192,7 @@ namespace
192192
if (outputHashes.count(outputHash) > 0)
193193
{
194194
auto &ass2 = *outputHashes[outputHash];
195-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + ass.name + "' in databank '" + ass.databank + "' has name hash collision with asset '" + ass2.name + "' in databank '" + ass2.databank + "'");
195+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + ass.name + ", in databank: " + ass.databank + ", has name hash collision with asset: " + ass2.name + ", in databank: " + ass2.databank);
196196
ass.corrupted = true;
197197
ass2.corrupted = true;
198198
}
@@ -211,7 +211,7 @@ namespace
211211
if (assets.count(it) == 0 && injectedNames.count(HashString(it)) == 0)
212212
{
213213
anyMissing = true;
214-
CAGE_LOG(SeverityEnum::Warning, "database", Stringizer() + "asset '" + ass.name + "' in databank '" + ass.databank + "' is missing reference '" + it + "'");
214+
CAGE_LOG(SeverityEnum::Warning, "database", Stringizer() + "asset: " + ass.name + ", in databank: " + ass.databank + ", is missing reference: " + it);
215215
}
216216
}
217217
if (anyMissing)
@@ -254,7 +254,7 @@ void checkAssets()
254254
for (const auto &it : assets)
255255
if (it.second->corrupted)
256256
asses.push_back(+it.second);
257-
tasksRunBlocking<Asset *const>("processing", Delegate<void(Asset *const &)>().bind<&processAsset>(), asses);
257+
tasksRunBlocking<Asset *const>("processing", Delegate<void(Asset *const &)>().bind<processAsset>(), asses);
258258
}
259259

260260
validateAssets();

‎sources/asset-database/scheme.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ bool SchemeField::applyToAssetField(String &val, const String &assetName) const
222222
{
223223
if (defaul.empty() && type != "string")
224224
{
225-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "' is a required property");
225+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", is a required");
226226
return false;
227227
}
228228
val = defaul;
@@ -232,7 +232,7 @@ bool SchemeField::applyToAssetField(String &val, const String &assetName) const
232232
{
233233
if (!isBool(val))
234234
{
235-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is not bool");
235+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is not bool");
236236
return false;
237237
}
238238
val = Stringizer() + toBool(val);
@@ -241,79 +241,79 @@ bool SchemeField::applyToAssetField(String &val, const String &assetName) const
241241
{
242242
if (val.empty() || !isDigitsOnly(val))
243243
{
244-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is not integer");
244+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is not integer");
245245
return false;
246246
}
247247
if (!min.empty() && toUint32(val) < toUint32(min))
248248
{
249-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too small");
249+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too small");
250250
return false;
251251
}
252252
if (!max.empty() && toUint32(val) > toUint32(max))
253253
{
254-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too large");
254+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too large");
255255
return false;
256256
}
257257
}
258258
else if (type == "sint32")
259259
{
260260
if (!isInteger(val))
261261
{
262-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is not integer");
262+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is not integer");
263263
return false;
264264
}
265265
if (!min.empty() && toSint32(val) < toSint32(min))
266266
{
267-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too small");
267+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too small");
268268
return false;
269269
}
270270
if (!max.empty() && toSint32(val) > toSint32(max))
271271
{
272-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too large");
272+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too large");
273273
return false;
274274
}
275275
}
276276
else if (type == "real")
277277
{
278278
if (!isReal(val))
279279
{
280-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is not real");
280+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is not real");
281281
return false;
282282
}
283283
if (!min.empty() && toDouble(val) < toDouble(min))
284284
{
285-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too small");
285+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too small");
286286
return false;
287287
}
288288
if (!max.empty() && toDouble(val) > toDouble(max))
289289
{
290-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too large");
290+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too large");
291291
return false;
292292
}
293293
}
294294
else if (type == "string")
295295
{
296296
if (!min.empty() && val.length() < toUint32(min))
297297
{
298-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too short");
298+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too short");
299299
return false;
300300
}
301301
if (!max.empty() && val.length() > toUint32(max))
302302
{
303-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is too long");
303+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is too long");
304304
return false;
305305
}
306306
}
307307
else if (type == "enum")
308308
{
309309
if (find(val, ',') != m)
310310
{
311-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' contains comma");
311+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", contains comma");
312312
return false;
313313
}
314314
if (!valuesContainsValue(values, val))
315315
{
316-
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset '" + assetName + "', field '" + this->name + "', value '" + val + "' is not listed in values");
316+
CAGE_LOG(SeverityEnum::Error, "database", Stringizer() + "asset: " + assetName + ", property: " + name + ", value: " + val + ", is not listed in values");
317317
return false;
318318
}
319319
}
@@ -337,7 +337,7 @@ namespace
337337
continue;
338338
Holder<Scheme> s = systemMemory().createHolder<Scheme>();
339339
s->name = pathExtractFilenameNoExtension(name);
340-
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "loading scheme '" + s->name + "'");
340+
CAGE_LOG(SeverityEnum::Info, "database", Stringizer() + "loading scheme: " + s->name);
341341
Holder<Ini> ini = newIni();
342342
ini->importFile(name);
343343
s->parse(+ini);

‎sources/asset-processor/animation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void processAnimation()
3939
n = inputFile + ";skeleton";
4040
else
4141
n = pathJoin(pathExtractDirectory(inputName), n);
42-
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "using skeleton name: '" + n + "'");
42+
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "using skeleton name: " + n);
4343
writeLine(String("ref = ") + n);
4444
return HashString(n);
4545
}();

‎sources/asset-processor/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ String convertFilePath(const String &input, const String &relativeTo, bool markA
145145

146146
void writeLine(const String &other)
147147
{
148-
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "writing: '" + other + "'");
148+
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "writing: " + other);
149149
{
150150
String b = other;
151151
if (trim(split(b, "=")) == "ref")
152-
CAGE_LOG(SeverityEnum::Note, "assetProcessor", Stringizer() + "reference hash: '" + (uint32)HashString(trim(b)) + "'");
152+
CAGE_LOG(SeverityEnum::Note, "assetProcessor", Stringizer() + "reference hash: " + (uint32)HashString(trim(b)));
153153
}
154154
if (fprintf(stdout, "%s\n", other.c_str()) < 0)
155155
CAGE_THROW_ERROR(SystemError, "fprintf", ferror(stdout));
@@ -162,7 +162,7 @@ String properties(const String &name)
162162
return it->second;
163163
else
164164
{
165-
CAGE_LOG_THROW(Stringizer() + "property name: '" + name + "'");
165+
CAGE_LOG_THROW(Stringizer() + "property name: " + name);
166166
CAGE_THROW_ERROR(Exception, "property not found");
167167
}
168168
}
@@ -174,7 +174,7 @@ int main(int argc, const char *args[])
174174
if (argc == 3 && String(args[1]) == "analyze")
175175
{
176176
initializeSecondaryLog(pathJoin(configGetString("cage-asset-processor/analyzeLog/path", "analyze-log"), pathReplaceInvalidCharacters(args[2]) + ".log"));
177-
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "analyzing input '" + args[2] + "'");
177+
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "analyzing input: " + args[2]);
178178
inputDirectory = pathExtractDirectory(args[2]);
179179
inputName = pathExtractFilename(args[2]);
180180
derivedProperties();
@@ -188,9 +188,9 @@ int main(int argc, const char *args[])
188188
initializeSecondaryLog(pathJoin(configGetString("cage-asset-processor/processLog/path", "process-log"), pathReplaceInvalidCharacters(inputName) + ".log"));
189189

190190
for (const auto &it : props)
191-
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "property '" + it.first + "': '" + it.second + "'");
191+
CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "property: " + it.first + " = " + it.second);
192192

193-
#define GCHL_GENERATE(N) CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "input " #N ": '" + N + "'");
193+
#define GCHL_GENERATE(N) CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "input: " #N " = " + N);
194194
GCHL_GENERATE(inputFileName);
195195
GCHL_GENERATE(outputFileName);
196196
GCHL_GENERATE(inputFile);

0 commit comments

Comments
 (0)