Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dotnetstandard name #113

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f0cf479
use sqlite instead of sqlServerCompact
jarped Dec 13, 2019
8e64db3
BL & DL projects now .Net Standard 2.0.
larseggan Dec 17, 2019
c9df34b
Updated version to version 1.2.3
larseggan Dec 17, 2019
11acc1c
- Added test project Test_Subscriber _NetCore for .net core 2.2, and …
larseggan Dec 18, 2019
2df1157
move databaseschema to const
jarped Dec 18, 2019
8be845e
added commandline parameers
jarped Dec 20, 2019
fa6918e
delete directly
jarped Dec 20, 2019
c12bc8b
ignore directory for filePath
jarped Dec 20, 2019
bcd745e
Fixed Help for NetCore client
larseggan Feb 27, 2020
d20036d
Added doc (.MD) for CORESubscriber.
larseggan Feb 27, 2020
34d5b97
DOC correction
larseggan Feb 27, 2020
20af5b0
Update README.md
larseggan Feb 27, 2020
54f3c7e
Update README.md
larseggan Feb 27, 2020
93ef220
Update README.md
larseggan Feb 27, 2020
5cd565e
Fixed timestamp, updated assembly version to 1.2.3.
larseggan Mar 6, 2020
7728349
Merge branch 'fixDotnetstandard' of https://github.com/kartverket/geo…
larseggan Mar 6, 2020
dd7d7d0
Provider fix: Regression error introduced in Commit 59bc7283 (date 20…
larseggan Mar 11, 2020
e6b3bf9
Subscriber updated to .NET framework 4.7.2.
larseggan Mar 11, 2020
6d002a5
Provider updated to .NET framework 4.7.2.
larseggan Mar 11, 2020
a24c7cd
Merge branch 'fixDotnetstandard' of https://github.com/kartverket/geo…
larseggan Mar 11, 2020
ef0d3d0
Update README.md
larseggan Mar 12, 2020
8353b79
Subscriber: SubscriberServiceInterface updated (NOIS changes)
larseggan Mar 18, 2020
0e92f3f
Merge branch 'fixDotnetstandard' of https://github.com/kartverket/geo…
larseggan Mar 18, 2020
9973d51
fixes #103
jarped May 28, 2020
97f9183
fixes #102
jarped May 28, 2020
5203135
Provider:
larseggan May 28, 2020
fd0757f
Merge pull request #105 from kartverket/fixDotnetstandard_pathFix
jarped Jun 16, 2020
5b1dfd2
Merge pull request #108 from kartverket/fixDotnetstandard_cliDoc
jarped Jun 16, 2020
02d0ea9
list prints name
jarped Jun 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,6 @@ paket-files/
__pycache__/
*.pyc
/Kartverket.Geosynkronisering.Server/Kartverket.Geosynkronisering/Changelogfiles
*.sqlite
/Kartverket.Geosynkronisering.Subscriber/Kartverket.Geosynkronisering.Subscriber.DL/Properties/PublishProfiles/FolderProfile.pubxml
/Kartverket.Geosynkronisering.Subscriber/Test_Subscriber_NetCore/Properties/PublishProfiles

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Eventing.Reader;
using System.IO;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.Security;
using Kartverket.Geosynkronisering.Database;
using System.Reflection;
using NLog;
using NLog.Targets;

namespace Kartverket.Geosynkronisering
{
public partial class GeosynkroniseringAdmin : Page
{
protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();

protected void ChangePage(object sender, CommandEventArgs e)
{

Expand All @@ -22,15 +29,15 @@ protected void ChangePage(object sender, CommandEventArgs e)

case "Prev":
if (e.CommandArgument == "DL")
if (vDataset.PageIndex > 0) vDataset.PageIndex = vDataset.PageIndex - 1;
else if (gwStoredChangeLogs.PageIndex > 0)
if (vDataset.PageIndex > 0) vDataset.PageIndex = vDataset.PageIndex - 1;
else if (gwStoredChangeLogs.PageIndex > 0)
gwStoredChangeLogs.PageIndex = gwStoredChangeLogs.PageIndex - 1;
break;

case "Next":
if (e.CommandArgument == "DL")
if (vDataset.PageIndex < vDataset.PageCount - 1) vDataset.PageIndex = vDataset.PageIndex + 1;
else if (gwStoredChangeLogs.PageIndex < gwStoredChangeLogs.PageCount - 1)
if (vDataset.PageIndex < vDataset.PageCount - 1) vDataset.PageIndex = vDataset.PageIndex + 1;
else if (gwStoredChangeLogs.PageIndex < gwStoredChangeLogs.PageCount - 1)
gwStoredChangeLogs.PageIndex = gwStoredChangeLogs.PageIndex + 1;
break;

Expand Down Expand Up @@ -103,7 +110,11 @@ protected void btnCreateInitialData_Click(object sender, EventArgs e)
{
IChangelogProvider changelogprovider;
int datasetId = Convert.ToInt32(vDataset.SelectedValue);

lblErrorText.Text = "";
btnLErrorfile.Visible = false;
ResetTextBoxLogfile(TextBoxErrorfile);

string initType = DatasetsData.DatasetProvider(datasetId);
//Initiate provider from config/dataset

Expand All @@ -123,10 +134,275 @@ protected void btnCreateInitialData_Click(object sender, EventArgs e)
innerExMsg += string.Format("{0}. \n", innerExp.Message);
innerExp = innerExp.InnerException;
}

string errorMsg = string.Format("Klarte ikke å lage initiell endringslogg. {0} \n {1}", ex.Message,
innerExMsg);
lblErrorText.Text = errorMsg;
btnLErrorfile.Visible = true;
}
}

private void ResetTextBoxLogfile(TextBox textBox)
{
textBox.Text = "";
textBox.Rows = 0;
textBox.Visible = false;
}

/// <summary>
/// Show the subscriber logfile
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnLogfile_Click(object sender, EventArgs e)
{

// test code
bool sendMail = false;
if (false)
{
bool isCtlClicked = false;
var postedValCtlClicked = txtHiddenLogfileControl.Value.ToString();
if (postedValCtlClicked == "ctl_clicked")
{
isCtlClicked = true;
}
Logger.Info("isCtlClicked:{0}", isCtlClicked);
sendMail = isCtlClicked;
}

// Show logfile
var logFilename = GetLogfilenameWarn();
if (File.Exists(logFilename))
{
Logger.Info("LogFile found:{0}", logFilename);

if (File.Exists(logFilename))
{
if (new FileInfo(logFilename).Length > 0)
{
TextBoxLogfile.Visible = true;
TextBoxLogfile.Rows = 10;

try
{
var contents = ReadLogfile(logFilename);
if (contents != null)
{
TextBoxLogfile.Text = contents;

if (false) // Test only
{
if (sendMail)
{
var mail = new Mail();
mail.SendMail(contents);
}
}
}
}
catch (Exception ex)
{
TextBoxLogfile.Text = ex.Message;
//throw;
}
}
else
{
ResetTextBoxLogfile(TextBoxLogfile);
}
}
else
{
ResetTextBoxLogfile(TextBoxLogfile);
}



// Test Can't use Process.Start from asp.net
if (false)
{
System.Diagnostics.Process process = null;
process = new Process();
process.StartInfo = new ProcessStartInfo()
{
UseShellExecute = true,
FileName = logFilename
};
process.Start();
}

}
else
{
Logger.Info("Logfile does not exist:{0}", logFilename);
lblLogfileText.Text = "Ingen varslinger fra abonnent funnet";
ResetTextBoxLogfile(TextBoxLogfile);
}

}

/// <summary>
/// Test sending mail.
/// This button will only be visibe when pressing CTRL+SHIFT+s
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSendmail_Click(object sender, EventArgs e)
{
var logFilename = GetLogfilenameWarn();
if (File.Exists(logFilename))
{
Logger.Info("LogFile found:{0}", logFilename);

if (File.Exists(logFilename))
{
if (new FileInfo(logFilename).Length > 0)
{
try
{
var contents = ReadLogfile(logFilename);
if (contents != null)
{
var mail = new Mail();
mail.SendMail(contents);

}
}
catch (Exception ex)
{
TextBoxLogfile.Text = ex.Message;
//throw;
}
}
}
}
}

protected void btnClearLogfile_Click(object sender, EventArgs e)
{
var logFilename = GetLogfilenameWarn();
if (File.Exists(logFilename))
{
Logger.Info("LogFile found:{0}, clear it", logFilename);
var fileStream = File.Open(logFilename, FileMode.Open);
fileStream.SetLength(0);
fileStream.Close();
Logger.Info("LogFile found:{0}, cleared", logFilename);
ResetTextBoxLogfile(TextBoxLogfile);
}
else
{
Logger.Info("Logfile does not exist:{0}", logFilename);
}

}

protected void vwConfig_Load(object sender, EventArgs e)
{
lblLogfileText.Text = "";
var logFilename = GetLogfilenameWarn();
if (File.Exists(logFilename))
{
if (new FileInfo(logFilename).Length > 0)
{
lblLogfileText.Text = "Det finnes varslinger fra abonnent";
//TextBoxLogfile.Visible = true;
}
}
}

private string ReadLogfile(string logFilename)
{
try
{
using (StreamReader stream = File.OpenText(logFilename))
{
var contents = stream.ReadToEnd();
stream.Close();
return contents;
}
}
catch (Exception ex)
{
Logger.Error(ex, "ReadLogfile failed");
throw;
}

}

protected void btnLErrorfile_Click(object sender, EventArgs e)
{
// Show logfile
var logFilename = GetLogfilenameError();
if (File.Exists(logFilename))
{
Logger.Info("LogFile found:{0}", logFilename);
//System.Diagnostics.Process.Start(logFilename);

if (new FileInfo(logFilename).Length > 0)
{
TextBoxErrorfile.Visible = true;
TextBoxErrorfile.Rows = 10;
try
{
var contents = ReadLogfile(logFilename);
if (contents != null)
{
TextBoxErrorfile.Text = contents;
}
}
catch (Exception ex)
{
TextBoxErrorfile.Text = ex.Message;
//throw;
}
}
else
{
ResetTextBoxLogfile(TextBoxErrorfile);
}
}
else
{
Logger.Info("Logfile does not exist:{0}", logFilename);
ResetTextBoxLogfile(TextBoxErrorfile);
}
}

#region nlog

private string GetLogfilenameWarn()
{
var fileTarget = (FileTarget) LogManager.Configuration.FindTargetByName("warnfile");
var logEventInfo = new LogEventInfo();
var fileName = fileTarget.FileName.Render(logEventInfo);
fileName = fileName.Replace("/", "");
return fileName;
}

private string GetLogfilenameLog()
{
var fileTarget = (FileTarget) LogManager.Configuration.FindTargetByName("logfile");

// Need to set timestamp here if filename uses date.
// For example - filename="${basedir}/logs/${shortdate}/trace.log"
var logEventInfo = new LogEventInfo {TimeStamp = DateTime.Now};
var fileName = fileTarget.FileName.Render(logEventInfo);
return fileName;
}

private string GetLogfilenameError()
{
var fileTarget = (FileTarget) LogManager.Configuration.FindTargetByName("errorfile");

// Need to set timestamp here if filename uses date.
// For example - filename="${basedir}/logs/${shortdate}/trace.log"
var logEventInfo = new LogEventInfo {TimeStamp = DateTime.Now};
var fileName = fileTarget.FileName.Render(logEventInfo);
return fileName;
}

#endregion
}
}
Loading