Skip to content

Commit 457e652

Browse files
committed
Revert temp changes for logging
1 parent f857da7 commit 457e652

File tree

2 files changed

+5
-74
lines changed

2 files changed

+5
-74
lines changed

.github/workflows/reusable-storage-dependant-tests.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,25 +158,6 @@ jobs:
158158
run: |
159159
docker stop $(docker ps -a -q)
160160
161-
- name: Temp log output
162-
if: |
163-
!cancelled()
164-
run: |
165-
echo "github event name: ${{ github.event_name }}"
166-
echo "reproc step outcome: ${{ steps.reprocessing.outcome }}"
167-
echo "complex step outcome: ${{ steps.complex_tests.outcome }}"
168-
169-
- name: Publish temp log files
170-
if: |
171-
!cancelled()
172-
timeout-minutes: 1
173-
uses: actions/upload-artifact@v4
174-
with:
175-
name: Log_PgsqlSwitches_${{ github.ref_name }}_${{ github.run_number }}_${{inputs.target_framework}}
176-
path: _Build/tests/${{ inputs.build_config }}/${{ inputs.target_framework }}/**
177-
if-no-files-found: ignore
178-
retention-days: 1
179-
180161
- name: Publish raw test results as files
181162
if: |
182163
(!cancelled() && inputs.publish_raw_results) || failure()

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Xtensive.Orm;
1414
using Xtensive.Sql.Info;
1515
using Xtensive.Sql.Drivers.PostgreSql.Resources;
16-
using System.Reflection;
1716

1817
namespace Xtensive.Sql.Drivers.PostgreSql
1918
{
@@ -215,56 +214,13 @@ private static bool SetOrGetExistingLegacyTimeStampBehaviorSwitch(bool valueToSe
215214

216215
private static bool GetSwitchValueOrSet(string switchName, bool valueToSet)
217216
{
218-
using (var logWriter = CreateFile(switchName)) {
219-
logWriter?.WriteLine($"GetSwitchValueOrSet called for switch '{switchName}' in attempt to set it to {valueToSet}");
220-
if (!AppContext.TryGetSwitch(switchName, out var currentValue)) {
221-
logWriter?.WriteLine($"Switch '{switchName}' is not set to any value at the moment, setting it to {valueToSet}");
222-
AppContext.SetSwitch(switchName, valueToSet);
223-
logWriter?.WriteLine($"Switch '{switchName}' is set to {valueToSet}");
224-
return valueToSet;
225-
}
226-
else {
227-
logWriter?.WriteLine($"Switch '{switchName}' is already set to value {currentValue}. Setting to {valueToSet} skipped");
228-
return currentValue;
229-
}
230-
}
231-
}
232-
233-
private static System.IO.TextWriter CreateFile(string switchName)
234-
{
235-
//F:\Projects\DataObjects.Net\Main Projects\do-public\new-master\_Build\tests\Debug\lib\net6.0
236-
var runningDirectory = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
237-
if (!runningDirectory.Contains("_Build/tests") && !runningDirectory.Contains(@"_Build\tests")) {
238-
return null;
217+
if (!AppContext.TryGetSwitch(switchName, out var currentValue)) {
218+
AppContext.SetSwitch(switchName, valueToSet);
219+
return valueToSet;
239220
}
240-
241-
var dirInfo = new System.IO.DirectoryInfo(runningDirectory);
242-
var dotnetName = dirInfo.Name; //net6.0
243-
var libFolder = dirInfo.Parent; // lib
244-
var buildConfigFolder = libFolder.Parent;//Debug/Release
245-
246-
var tempFilesFolder = buildConfigFolder.CreateSubdirectory(dotnetName);
247-
var fileToWrite = System.IO.File.CreateText(System.IO.Path.Combine(tempFilesFolder.FullName, $"Switch_{switchName.Replace('.', '_')}_{InstanceIdentifier}.log"));
248-
return fileToWrite;
249-
}
250-
251-
private static System.IO.TextWriter CreateFile()
252-
{
253-
//F:\Projects\DataObjects.Net\Main Projects\do-public\new-master\_Build\tests\Debug\lib\net6.0
254-
var runningDirectory = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
255-
if (!runningDirectory.Contains($"_Build{System.IO.Path.DirectorySeparatorChar}tests")
256-
&& !runningDirectory.Contains($"_Build{System.IO.Path.AltDirectorySeparatorChar}tests")) {
257-
return null;
221+
else {
222+
return currentValue;
258223
}
259-
260-
var dirInfo = new System.IO.DirectoryInfo(runningDirectory);
261-
var dotnetName = dirInfo.Name; //net6.0
262-
var libFolder = dirInfo.Parent; // lib
263-
var buildConfigFolder = libFolder.Parent;//Debug/Release
264-
265-
var tempFilesFolder = buildConfigFolder.CreateSubdirectory(dotnetName);
266-
var fileToWrite = System.IO.File.CreateText(System.IO.Path.Combine(tempFilesFolder.FullName, $"CtorCall_{InstanceIdentifier}.log"));
267-
return fileToWrite;
268224
}
269225

270226
#endregion
@@ -301,12 +257,6 @@ static DriverFactory()
301257

302258
// DO NOT REPLACE method call with constant value when debugging, CHANGE THE PARAMETER VALUE.
303259
LegacyTimestamptBehaviorEnabled = SetOrGetExistingLegacyTimeStampBehaviorSwitch(valueToSet: false);
304-
305-
using(var logWriter = CreateFile()) {
306-
logWriter.WriteLine($"Driver factory was initialized with");
307-
logWriter.WriteLine($" InfinityAliasForDatesEnabled = {InfinityAliasForDatesEnabled}");
308-
logWriter.WriteLine($" LegacyTimestamptBehaviorEnabled = {LegacyTimestamptBehaviorEnabled}");
309-
}
310260
}
311261
}
312262
}

0 commit comments

Comments
 (0)