Skip to content

Commit aebd045

Browse files
authored
Merge pull request #70 from FN-FAL113/Debug/write-exceptions-to-file
write exceptions to file
2 parents 4240f14 + 455950c commit aebd045

File tree

11 files changed

+43
-25
lines changed

11 files changed

+43
-25
lines changed

CS2ServerPicker/App.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
Environment.NewLine +
132132
"Author: FN-FAL113 (github username)" + Environment.NewLine +
133133
"License: GNU General Public License V3" + Environment.NewLine +
134-
"App Version: 2.2.2",
134+
"App Version: 2.2.3",
135135
"App Info"
136136
)
137137
End Sub

CS2ServerPicker/CS2ServerPicker.vbproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<SubType>Form</SubType>
150150
</Compile>
151151
<Compile Include="Services\DataGridViewService.vb" />
152+
<Compile Include="Services\ErrorService.vb" />
152153
<Compile Include="Services\PingService.vb" />
153154
<Compile Include="My Project\AssemblyInfo.vb" />
154155
<Compile Include="My Project\Application.Designer.vb">

CS2ServerPicker/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2.2.2.0")>
36-
<Assembly: AssemblyFileVersion("2.2.2.0")>
35+
<Assembly: AssemblyVersion("2.2.3.0")>
36+
<Assembly: AssemblyFileVersion("2.2.3.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

CS2ServerPicker/Presets/AddPresetForm.vb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ Public Class AddPresetForm
5959

6060
MessageBox.Show("Succesfully added preset!", "Info")
6161
Catch ex As Exception
62-
MessageBox.Show("An error has occured while adding preset! Error: " _
63-
+ Environment.NewLine + Environment.NewLine + ex.Message, "Add Preset Error")
62+
Log_Exception_To_File(ex, "An error has occured while adding preset!")
63+
64+
MessageBox.Show("An error has occured while adding preset! Please upload error file to github issue tracker.", "Add Preset Error")
6465
End Try
6566
End Sub
6667

CS2ServerPicker/Presets/DeletePresetForm.vb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ Public Class DeletePresetForm
3131
' refresh/reload presets control data grids
3232
Presets.Load_Presets()
3333
Catch ex As Exception
34-
MessageBox.Show("An error has occured while deleting preset! Please report to github issue-tracker. Error: " _
35-
+ Environment.NewLine + Environment.NewLine + ex.Message, "Delete Preset Error")
34+
Log_Exception_To_File(ex, "An error has occured while deleting preset!")
35+
36+
MessageBox.Show("An error has occured while deleting preset! Please upload error file to github issue tracker.", "Delete Preset Error")
3637

3738
Return
3839
End Try

CS2ServerPicker/Presets/Presets.vb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ Public Class Presets
9898
PresetsDataGridView.Rows(rowIndex).Cells(0).Value = preset.Value.SelectToken("presetName")
9999
Next
100100
Catch ex As Exception
101-
MessageBox.Show("An error has occured while loading presets! Please report to github issue-tracker. Error: " _
102-
+ Environment.NewLine + Environment.NewLine + ex.Message, "Load Presets Error")
101+
Log_Exception_To_File(ex, "An error has occured while loading presets!")
102+
103+
MessageBox.Show("An error has occured while loading presets! Please upload error file to github issue tracker.", "Load Presets Error")
103104
End Try
104105
End Sub
105106

@@ -127,8 +128,9 @@ Public Class Presets
127128
PresetServerListDataGridView.Rows(rowIndex).Cells(0).Value = server
128129
Next
129130
Catch ex As Exception
130-
MessageBox.Show("An error has occured while loading preset servers! Please report to github issue-tracker. Error: " _
131-
+ Environment.NewLine + Environment.NewLine + ex.Message, "Load Preset Servers Error")
131+
Log_Exception_To_File(ex, "An error has occured while loading preset servers!")
132+
133+
MessageBox.Show("An error has occured while loading preset servers! Please upload error file to github issue tracker", "Load Preset Servers Error")
132134
End Try
133135
End Sub
134136
End Class

CS2ServerPicker/Presets/UpdatePresetForm.vb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ Public Class UpdatePresetForm
7979

8080
MessageBox.Show("Succesfully updated preset!", "Info")
8181
Catch ex As Exception
82-
MessageBox.Show("An error has occured while updating preset! Error: " _
83-
+ Environment.NewLine + Environment.NewLine + ex.Message, "Update Preset Error")
82+
Log_Exception_To_File(ex, "An error has occured while updating preset!")
83+
84+
MessageBox.Show("An error has occured while updating preset! Please upload error file to github issue tracker.", "Update Preset Error")
8485
End Try
8586
End Sub
8687

CS2ServerPicker/Services/DataGridViewService.vb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
Imports System.Net
2-
3-
Module DataGridViewService
1+
Module DataGridViewService
42

53
' cache server flag image to prevent unnecessary requests
64

@@ -9,8 +7,6 @@ Module DataGridViewService
97

108
Dim dg As DataGridView = App.Get_DataGridView_Control()
119

12-
Dim wClient As WebClient = New WebClient()
13-
1410
' display each server name key value from server dictionary in the datagridview control
1511
For Each kvp As KeyValuePair(Of String, String) In serverDict
1612
Dim rowIndex As Integer = App.Get_DataGridView_Control().Rows().Add()
@@ -19,7 +15,6 @@ Module DataGridViewService
1915
dg.Rows(rowIndex).Cells(1).Value = kvp.Key
2016
Next
2117

22-
wClient.Dispose()
2318
End Sub
2419

2520
Public Sub Clear_Column_Values()
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Imports System.IO
2+
3+
Module ErrorService
4+
Public Sub Log_Exception_To_File(exception As Exception, errorFrom As String)
5+
File.AppendAllText(System.AppDomain.CurrentDomain.BaseDirectory + "error_" + DateTimeOffset.Now.ToUnixTimeSeconds.ToString() + ".txt",
6+
errorFrom + Environment.NewLine + exception.Message)
7+
End Sub
8+
End Module

CS2ServerPicker/Services/ServerService.vb

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ Module ServerService
8787

8888
Return serverRevision
8989
Catch ex As Exception
90-
MessageBox.Show("An error has occured while retrieving or displaying server data! Please report to github issue-tracker.", "Server Data Fetch/Display Error")
90+
Log_Exception_To_File(ex, "An error has occurred while retrieving or displaying server data!")
91+
92+
MessageBox.Show("An error has occurred while retrieving or displaying server data! Please upload error file to github issue tracker", "Server Data Fetch/Display Error")
9193

9294
Return "null"
9395
End Try
@@ -155,7 +157,9 @@ Module ServerService
155157
Continue For
156158
End If
157159
Catch ex As Exception
158-
MessageBox.Show("An error has occured while blocking servers by preset with the following message: " + Environment.NewLine + ex.Message, "Error")
160+
Log_Exception_To_File(ex, "An error has occurred while blocking servers by preset!")
161+
162+
MessageBox.Show("An error has occurred while blocking servers by preset! Please upload error file to github issue tracker.", "Error")
159163
End Try
160164
Next
161165

@@ -216,7 +220,9 @@ Module ServerService
216220
Continue For
217221
End If
218222
Catch ex As Exception
219-
MessageBox.Show("An error has occured while blocking/unblocking selected server with the following message: " + Environment.NewLine + ex.Message, "Error")
223+
Log_Exception_To_File(ex, "An error has occurred while blocking/unblocking selected server!")
224+
225+
MessageBox.Show("An error has occurred while blocking/unblocking selected server! Please upload error file to github issue tracker.", "Error")
220226
End Try
221227
Next
222228

@@ -273,7 +279,9 @@ Module ServerService
273279
Continue For
274280
End If
275281
Catch ex As Exception
276-
MessageBox.Show("An error has occured while blocking/unblocking all servers with the following message: " + Environment.NewLine + ex.Message, "Error")
282+
Log_Exception_To_File(ex, "An error has occurred while blocking/unblocking all servers!")
283+
284+
MessageBox.Show("An error has occurred while blocking/unblocking all servers! Please upload error file to github issue tracker.", "Error")
277285
End Try
278286
Next
279287

@@ -291,7 +299,8 @@ Module ServerService
291299
proc.Start()
292300
proc.WaitForExit()
293301

294-
Dim procOutput = proc.StandardOutput.ReadToEnd() ' retrieve command output from stdout descriptor
302+
' retrieve command output from stdout descriptor
303+
Dim procOutput = proc.StandardOutput.ReadToEnd()
295304

296305
is_rule_exist = procOutput.Contains("CS2ServerPicker_" + region_trimmed)
297306

0 commit comments

Comments
 (0)