Merge pull request #123 from skbkontur/feature/dont-write-error-autoupdate

dont write error in console in autoupdate

Author: likvidator3301

Commands/SelfUpdate.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using Common;
+using Microsoft.Build.Logging;
 using Microsoft.Extensions.Logging;
 
 namespace Commands
@@ -35,11 +36,17 @@ public static void UpdateIfOld()
                 if (diff <= TimeSpan.FromHours(5))
                     return;
                 isAutoUpdate = true;
-                new SelfUpdate().Run(new[] {"self-update"});
+                var exitCode = new SelfUpdate().Run(new[] {"self-update"});
+                if (exitCode != 0)
+                {
+                    Log.LogError("Auto update cement failed. 'self-update' exited with code '{Code}'", exitCode);
+                    ConsoleWriter.WriteWarning("Auto update failed. Check previous warnings for details");
+                }
             }
             catch (Exception exception)
             {
-                Log.LogError("Fail to auto update", exception);
+                Log.LogError("Auto update failed, error: '{Exception}'", exception);
+                ConsoleWriter.WriteWarning("Auto update failed. Check logs for details");
             }
         }
 
@@ -187,21 +194,21 @@ private bool UpdateBinaries(ICementUpdater updater, string oldHash, string newHa
                 Log.LogDebug(okMessage);
                 return true;
             }
-            catch (WebException ex)
+            catch (WebException webException)
             {
-                Log.LogError("Fail self-update", ex);
+                Log.LogError("Fail self-update, exception: '{Exception}'", webException);
 
-                if (ex.Status == WebExceptionStatus.ProtocolError && ex.Response != null)
+                if (webException.Status == WebExceptionStatus.ProtocolError && webException.Response != null)
                 {
-                    var resp = (HttpWebResponse) ex.Response;
+                    var resp = (HttpWebResponse) webException.Response;
                     if (resp.StatusCode == HttpStatusCode.NotFound) // HTTP 404
                     {
-                        ConsoleWriter.WriteError($"Failed to look for updates on branch {branch}. Server responsed 404 ({updater.GetName()})");
+                        ConsoleWriter.WriteWarning($"Failed to look for updates on branch {branch}. Server replied 404 ({updater.GetName()})");
                         return false;
                     }
                 }
 
-                ConsoleWriter.WriteError($"Failed to look for updates on branch {branch}. {ex.Message} ({updater.GetName()})");
+                ConsoleWriter.WriteWarning($"Failed to look for updates on branch {branch}. {webException.Message} ({updater.GetName()})");
                 return false;
             }
         }

Common/CementFromGitHubUpdater.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Net;
-using Common.Extensions;
 using Microsoft.Extensions.Logging;
 
 namespace Common
@@ -31,19 +30,19 @@ public string GetNewCommitHash()
                 var parts = downloadUri.Split('/', '.');
                 return parts[parts.Length - 2];
             }
-            catch (WebException ex)
+            catch (WebException webException)
             {
-                log.LogError("Fail self-update ", ex);
-                if (ex.Status == WebExceptionStatus.ProtocolError && ex.Response != null)
+                log.LogError("Fail self-update, exception: '{Exception}' ", webException);
+                if (webException.Status == WebExceptionStatus.ProtocolError && webException.Response != null)
                 {
-                    var resp = (HttpWebResponse) ex.Response;
-                    if (resp.StatusCode == HttpStatusCode.NotFound) // HTTP 404
+                    var response = (HttpWebResponse) webException.Response;
+                    if (response.StatusCode == HttpStatusCode.NotFound) // HTTP 404
                     {
-                        ConsoleWriter.WriteError("Failed to look for updates on github. Server responsed 404");
+                        ConsoleWriter.WriteWarning("Failed to look for updates on github. Server replied 404");
                         return null;
                     }
                 }
-                ConsoleWriter.WriteError("Failed to look for updates on github: " + ex.Message);
+                ConsoleWriter.WriteWarning("Failed to look for updates on github: " + webException.Message);
                 return null;
             }
         }

Common/CementFromServerUpdater.cs

@@ -23,22 +23,22 @@ public string GetNewCommitHash()
             var webClient = new WebClient();
             try
             {
-                var infoModel = JsonConvert.DeserializeObject<InfoResponseModel>(webClient.DownloadString($"{CementSettings.Get().CementServer}/api/v1/cement/info/head/" + branch));
-                return infoModel?.CommitHash;
+                var info = JsonConvert.DeserializeObject<InfoResponseModel>(webClient.DownloadString($"{CementSettings.Get().CementServer}/api/v1/cement/info/head/" + branch));
+                return info?.CommitHash;
             }
-            catch (WebException ex)
+            catch (WebException webException)
             {
-                log.LogError("Fail self-update ", ex);
-                if (ex.Status == WebExceptionStatus.ProtocolError && ex.Response != null)
+                log.LogError("Fail self-update, exception: '{Exception}'", webException);
+                if (webException.Status == WebExceptionStatus.ProtocolError && webException.Response != null)
                 {
-                    var resp = (HttpWebResponse) ex.Response;
-                    if (resp.StatusCode == HttpStatusCode.NotFound) // HTTP 404
+                    var response = (HttpWebResponse) webException.Response;
+                    if (response.StatusCode == HttpStatusCode.NotFound) // HTTP 404
                     {
-                        ConsoleWriter.WriteError("Failed to look for updates on branch " + branch + ". Server responsed 404");
+                        ConsoleWriter.WriteWarning("Failed to look for updates on branch " + branch + ". Server replied 404");
                         return null;
                     }
                 }
-                ConsoleWriter.WriteError("Failed to look for updates on branch " + branch + ": " + ex.Message);
+                ConsoleWriter.WriteWarning("Failed to look for updates on branch " + branch + ": " + webException.Message);
                 return null;
             }
         }